r8: Update R8 to 2.1.28-dev

Built locally with verbose and debugging disabled

Change-Id: I962b23af9ef2fa41800de5ff1cd9e11fcc149718
Signed-off-by: Jason Edson <jaysonedson@gmail.com>
diff --git a/r8.jar b/r8.jar
index bd83e7d..aaac941 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index bdb67fd..fc2c46a 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,11 +1,9 @@
 # compiler: R8
-# compiler_version: 2.1.23-dev
+# compiler_version: 2.1.28-dev
 # compiler_hash: engineering
-# pg_map_id: a5eae5b
+# pg_map_id: 2f3f423
 # common_typos_disable
-com.android.tools.r8.$r8$EnumUnboxingUtility -> com.android.tools.r8.a:
-    int $enumboxing$ordinal(int) -> a
-com.android.tools.r8.ApiLevelException -> com.android.tools.r8.b:
+com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:15 -> <init>
@@ -47,15 +45,14 @@
     2:8:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):92:98 -> a
     9:13:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):96:100 -> a
     14:23:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):92:101 -> a
-    24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     24:24:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):101 -> a
     25:25:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):101:101 -> a
-    26:26:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):100:100 -> a
-    27:32:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):112:117 -> a
-    33:33:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):116:116 -> a
-    34:44:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:125 -> a
-    45:45:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):121:121 -> a
-    46:46:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):120:120 -> a
+    26:31:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):112:117 -> a
+    32:32:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):116:116 -> a
+    33:43:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:125 -> a
+    44:44:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):121:121 -> a
+    45:45:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):120:120 -> a
     1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path):59:59 -> fromArchive
     2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path,java.util.function.Predicate):64:64 -> fromArchive
     1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier):72:72 -> fromSupplier
@@ -128,10 +125,10 @@
     107:107:void lambda$main$2(java.lang.String[]):109:109 -> a
     1:1:void main(java.lang.String[]):109:109 -> main
     1:13:void run(com.android.tools.r8.BackportedMethodListCommand):73:85 -> run
-    14:14:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):52:52 -> run
+    14:14:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
     14:14:void run(com.android.tools.r8.BackportedMethodListCommand):84 -> run
-    15:15:void run(com.android.tools.r8.BackportedMethodListCommand):100:100 -> run
-    16:16:void run(java.lang.String[]):105:105 -> run
+    15:16:void run(com.android.tools.r8.BackportedMethodListCommand):100:101 -> run
+    17:17:void run(java.lang.String[]):105:105 -> run
 com.android.tools.r8.BackportedMethodListCommand -> com.android.tools.r8.BackportedMethodListCommand:
     com.android.tools.r8.graph.DexItemFactory factory -> h
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> e
@@ -190,9 +187,7 @@
     26:36:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):249:259 -> build
     26:36:com.android.tools.r8.BackportedMethodListCommand build():335 -> build
     37:37:com.android.tools.r8.BackportedMethodListCommand build():335:335 -> build
-    38:38:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory):253:253 -> build
-    38:38:com.android.tools.r8.BackportedMethodListCommand build():335 -> build
-    39:39:com.android.tools.r8.BackportedMethodListCommand build():316:316 -> build
+    38:38:com.android.tools.r8.BackportedMethodListCommand build():316:316 -> build
     1:1:int getMinApiLevel():213:213 -> getMinApiLevel
     1:1:boolean isPrintHelp():283:283 -> isPrintHelp
     1:1:boolean isPrintVersion():294:294 -> isPrintVersion
@@ -214,85 +209,84 @@
     boolean printHelp -> a
     boolean printVersion -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:5:void <init>(boolean,boolean):38:42 -> <init>
-    6:11:void <init>(com.android.tools.r8.utils.AndroidApp):45:50 -> <init>
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:5:void <init>(boolean,boolean):40:44 -> <init>
+    6:11:void <init>(com.android.tools.r8.utils.AndroidApp):47:52 -> <init>
     com.android.tools.r8.utils.InternalOptions getInternalOptions() -> a
-    1:1:com.android.tools.r8.utils.AndroidApp getInputApp():63:63 -> getInputApp
-    1:1:boolean isPrintHelp():54:54 -> isPrintHelp
-    1:1:boolean isPrintVersion():58:58 -> isPrintVersion
+    1:1:com.android.tools.r8.utils.AndroidApp getInputApp():65:65 -> getInputApp
+    1:1:boolean isPrintHelp():56:56 -> isPrintHelp
+    1:1:boolean isPrintVersion():60:60 -> isPrintVersion
 com.android.tools.r8.BaseCommand$Builder -> com.android.tools.r8.BaseCommand$Builder:
     java.util.List programFiles -> e
     com.android.tools.r8.utils.AndroidApp$Builder app -> d
     com.android.tools.r8.utils.Reporter reporter -> a
     boolean printHelp -> b
     boolean printVersion -> c
-    1:1:void <init>():115:115 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):119:119 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):122:122 -> <init>
-    4:20:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):108:124 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> a
-    2:2:void lambda$addClasspathFiles$3(java.nio.file.Path[]):216:216 -> a
-    3:3:void lambda$addClasspathFiles$4(java.util.Collection):222:222 -> a
-    4:4:void addClasspathFile(java.nio.file.Path):227:227 -> a
-    5:5:void lambda$addClasspathResourceProvider$6(com.android.tools.r8.ClassFileResourceProvider):232:232 -> a
-    6:6:void lambda$addClassProgramData$7(byte[],com.android.tools.r8.origin.Origin):238:238 -> a
-    7:7:void lambda$addMainDexClasses$11(java.lang.String[]):295:295 -> a
-    8:8:void lambda$setIgnoreDexInArchive$13(boolean):350:350 -> a
-    9:11:void guard(java.lang.Runnable):364:366 -> a
-    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):238:239 -> addClassProgramData
-    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):216:217 -> addClasspathFiles
-    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):222:223 -> addClasspathFiles
-    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):232:233 -> addClasspathResourceProvider
-    1:2:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):244:245 -> addDexProgramData
-    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):195:196 -> addLibraryFiles
-    3:13:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):201:211 -> addLibraryFiles
-    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):189:190 -> addLibraryResourceProvider
-    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):295:296 -> addMainDexClasses
-    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):308:309 -> addMainDexClasses
-    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):258:266 -> addMainDexListFiles
-    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):275:283 -> addMainDexListFiles
-    1:2:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.nio.file.Path[]):157:158 -> addProgramFiles
-    3:14:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:178 -> addProgramFiles
-    1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):183:184 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.utils.Reporter getReporter():162:162 -> b
-    2:2:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189:189 -> b
-    3:7:void lambda$addLibraryFiles$2(java.util.Collection):203:207 -> b
-    8:8:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):358:358 -> b
-    8:8:void lambda$addLibraryFiles$2(java.util.Collection):207 -> b
-    9:9:void lambda$addClasspathFile$5(java.nio.file.Path):227:227 -> b
-    10:10:void lambda$addDexProgramData$8(byte[],com.android.tools.r8.origin.Origin):244:244 -> b
-    11:11:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260:260 -> b
-    12:962:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):0:950 -> b
-    12:962:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260 -> b
-    963:965:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
-    966:966:void setIgnoreDexInArchive(boolean):350:350 -> b
-    1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
+    1:1:void <init>():117:117 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):121:121 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):124:124 -> <init>
+    4:20:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):110:126 -> <init>
+    1:3:void lambda$build$0(com.android.tools.r8.utils.Box):143:145 -> a
+    4:4:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():155:155 -> a
+    5:5:void lambda$addClasspathFiles$4(java.nio.file.Path[]):219:219 -> a
+    6:6:void lambda$addClasspathFiles$5(java.util.Collection):225:225 -> a
+    7:7:void addClasspathFile(java.nio.file.Path):230:230 -> a
+    8:8:void lambda$addClasspathResourceProvider$7(com.android.tools.r8.ClassFileResourceProvider):235:235 -> a
+    9:9:void lambda$addClassProgramData$8(byte[],com.android.tools.r8.origin.Origin):241:241 -> a
+    10:10:void lambda$addMainDexClasses$12(java.lang.String[]):298:298 -> a
+    11:11:void lambda$setIgnoreDexInArchive$14(boolean):353:353 -> a
+    12:14:void guard(java.lang.Runnable):367:369 -> a
+    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):241:242 -> addClassProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):219:220 -> addClasspathFiles
+    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):225:226 -> addClasspathFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):235:236 -> addClasspathResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):247:248 -> addDexProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):198:199 -> addLibraryFiles
+    3:13:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):204:214 -> addLibraryFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):192:193 -> addLibraryResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):298:299 -> addMainDexClasses
+    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):311:312 -> addMainDexClasses
+    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):261:269 -> addMainDexListFiles
+    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):278:286 -> addMainDexListFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.nio.file.Path[]):160:161 -> addProgramFiles
+    3:14:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):170:181 -> addProgramFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):186:187 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.utils.Reporter getReporter():165:165 -> b
+    2:2:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):192:192 -> b
+    3:7:void lambda$addLibraryFiles$3(java.util.Collection):206:210 -> b
+    8:8:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):361:361 -> b
+    8:8:void lambda$addLibraryFiles$3(java.util.Collection):210 -> b
+    9:9:void lambda$addClasspathFile$6(java.nio.file.Path):230:230 -> b
+    10:10:void lambda$addDexProgramData$9(byte[],com.android.tools.r8.origin.Origin):247:247 -> b
+    11:11:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):263:263 -> b
+    12:1067:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):0:1055 -> b
+    12:1067:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):263 -> b
+    1068:1070:void lambda$addMainDexListFiles$10(java.nio.file.Path[]):265:265 -> b
+    1071:1071:void setIgnoreDexInArchive(boolean):353:353 -> b
+    1:9:com.android.tools.r8.BaseCommand build():139:147 -> build
     com.android.tools.r8.BaseCommand makeCommand() -> c
-    1:1:void lambda$addMainDexClasses$12(java.util.Collection):308:308 -> c
+    1:1:void lambda$addMainDexClasses$13(java.util.Collection):311:311 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:4:void lambda$addMainDexListFiles$10(java.util.Collection):277:280 -> d
-    5:5:void lambda$addMainDexListFiles$10(java.util.Collection):279:279 -> d
+    1:4:void lambda$addMainDexListFiles$11(java.util.Collection):280:283 -> d
+    5:5:void lambda$addMainDexListFiles$11(java.util.Collection):282:282 -> d
     void validate() -> e
-    1:6:void lambda$addProgramFiles$0(java.util.Collection):169:174 -> e
-    7:7:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):358:358 -> e
-    7:7:void lambda$addProgramFiles$0(java.util.Collection):174 -> e
-    1:1:void error(com.android.tools.r8.Diagnostic):336:336 -> error
-    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):345:345 -> fatalError
-    2:4:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> fatalError
-    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):345 -> fatalError
-    1:1:boolean isPrintHelp():314:314 -> isPrintHelp
-    1:1:boolean isPrintVersion():325:325 -> isPrintVersion
-    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):319:320 -> setPrintHelp
-    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):330:331 -> setPrintVersion
+    1:6:void lambda$addProgramFiles$1(java.util.Collection):172:177 -> e
+    7:7:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):361:361 -> e
+    7:7:void lambda$addProgramFiles$1(java.util.Collection):177 -> e
+    1:1:void error(com.android.tools.r8.Diagnostic):339:339 -> error
+    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):348:348 -> fatalError
+    1:1:boolean isPrintHelp():317:317 -> isPrintHelp
+    1:1:boolean isPrintVersion():328:328 -> isPrintVersion
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):322:323 -> setPrintHelp
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):333:334 -> setPrintVersion
 com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.BaseCommand$a:
     java.lang.String inputType -> c
-    1:2:void <init>(java.lang.String,java.nio.file.Path):73:74 -> <init>
-    1:1:java.lang.String part():79:79 -> part
+    1:2:void <init>(java.lang.String,java.nio.file.Path):75:76 -> <init>
+    1:1:java.lang.String part():81:81 -> part
 com.android.tools.r8.BaseCommand$LibraryInputOrigin -> com.android.tools.r8.BaseCommand$b:
-    1:1:void <init>(java.nio.file.Path):93:93 -> <init>
+    1:1:void <init>(java.nio.file.Path):95:95 -> <init>
 com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.BaseCommand$c:
-    1:1:void <init>(java.nio.file.Path):86:86 -> <init>
+    1:1:void <init>(java.nio.file.Path):88:88 -> <init>
 com.android.tools.r8.BaseCompilerCommand -> com.android.tools.r8.BaseCompilerCommand:
     java.util.List outputInspections -> o
     int minApiLevel -> h
@@ -372,8 +366,8 @@
     6:111:java.nio.file.Path com.android.tools.r8.utils.FileUtils.validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):0:105 -> e
     6:111:void validate():555 -> e
     112:143:void validate():556:587 -> e
-    144:186:void com.android.tools.r8.utils.Reporter.warning(java.lang.String):0:42 -> e
-    144:186:void validate():583 -> e
+    144:177:void com.android.tools.r8.utils.Reporter.warning(java.lang.String):0:33 -> e
+    144:177:void validate():583 -> e
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
     1:1:java.util.List getAssertionsConfiguration():537:537 -> g
     1:1:java.util.function.BiPredicate getDexClassChecksumFilter():282:282 -> getDexClassChecksumFilter
@@ -406,7 +400,7 @@
     1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):394:394 -> <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):401:401 -> <init>
-com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.c:
+com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     java.lang.Iterable ASSERTIONS_USAGE_MESSAGE -> a
     java.lang.String PACKAGE_ASSERTION_POSTFIX -> b
     boolean $assertionsDisabled -> c
@@ -448,7 +442,6 @@
     2:2:void <init>(java.nio.file.Path,boolean):96:96 -> <init>
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.ClassFileConsumer):100:100 -> <init>
     4:9:void <init>(java.nio.file.Path,com.android.tools.r8.ClassFileConsumer,boolean):104:109 -> <init>
-    1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):154:154 -> a
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):120:121 -> accept
     3:3:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):126:126 -> accept
     4:4:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):131:131 -> accept
@@ -456,8 +449,8 @@
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():115:115 -> getDataResourceConsumer
     1:1:java.nio.file.Path internalGetOutputPath():142:142 -> internalGetOutputPath
     1:7:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):148:154 -> writeResources
-    8:10:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):151:153 -> writeResources
-    11:15:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):150:154 -> writeResources
+    8:8:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):151:151 -> writeResources
+    9:9:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):150:150 -> writeResources
 com.android.tools.r8.ClassFileConsumer$DirectoryConsumer -> com.android.tools.r8.ClassFileConsumer$DirectoryConsumer:
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> c
     boolean consumeDataResouces -> d
@@ -488,7 +481,8 @@
 com.android.tools.r8.CompilationFailedException -> com.android.tools.r8.CompilationFailedException:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(java.lang.Throwable):18:18 -> <init>
-    3:3:void <init>(java.lang.String):22:22 -> <init>
+    3:3:void <init>(java.lang.String,java.lang.Throwable):22:22 -> <init>
+    4:4:void <init>(java.lang.String):26:26 -> <init>
 com.android.tools.r8.CompilationMode -> com.android.tools.r8.CompilationMode:
     com.android.tools.r8.CompilationMode[] $VALUES -> a
     1:3:void <clinit>():10:12 -> <clinit>
@@ -497,48 +491,50 @@
     1:1:com.android.tools.r8.CompilationMode valueOf(java.lang.String):7:7 -> valueOf
     1:1:com.android.tools.r8.CompilationMode[] values():7:7 -> values
 com.android.tools.r8.D8 -> com.android.tools.r8.D8:
-    1:3:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):94:96 -> a
-    4:15:void run(java.lang.String[]):119:130 -> a
-    4:15:void lambda$main$2(java.lang.String[]):143 -> a
-    16:17:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):148:149 -> a
-    18:18:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):52:52 -> a
-    18:18:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):149 -> a
-    19:21:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):186:188 -> a
-    22:22:void lambda$run$5(java.lang.String):217:217 -> a
-    23:61:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):305:343 -> a
-    62:62: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):355:355 -> a
-    63:63: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):395:395 -> a
-    63:63: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):355 -> a
-    64:64: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):356:356 -> a
-    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):114:114 -> b
-    1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:155 -> c
-    1:23:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):162:184 -> d
-    24:37:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:196 -> d
-    38:38: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):391:391 -> d
-    38:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196 -> d
-    39:86:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):197:244 -> d
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> d
-    87:87:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):245 -> d
-    88:94:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):246:252 -> d
-    95:95:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():413:413 -> d
-    95:95:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):254 -> d
-    96:112:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):254:270 -> d
-    113:141:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):262:290 -> d
-    142:147:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285:290 -> d
-    1:5:void main(java.lang.String[]):139:143 -> main
-    1:5:void run(com.android.tools.r8.D8Command):87:91 -> run
-    6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):52:52 -> run
-    6:6:void run(com.android.tools.r8.D8Command):90 -> run
-    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):109:112 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):52:52 -> run
-    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):111 -> run
+    1:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):92:95 -> a
+    5:16:void run(java.lang.String[]):117:128 -> a
+    5:16:void lambda$main$2(java.lang.String[]):141 -> a
+    17:18:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):146:147 -> a
+    19:19:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> a
+    19:19:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):147 -> a
+    20:22:void lambda$run$4(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):181:183 -> a
+    23:23:void lambda$run$5(java.lang.String):212:212 -> a
+    24:62:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):300:338 -> a
+    63:63: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):350:350 -> a
+    64:64: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):392:392 -> a
+    64:64: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):350 -> a
+    65:65: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):351:351 -> a
+    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):112:112 -> b
+    1:4:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):151:154 -> c
+    1:20:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):160:179 -> d
+    21:34:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):178:191 -> d
+    35:35:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):388:388 -> d
+    35:35:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):191 -> d
+    36:83:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):192:239 -> d
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> d
+    84:84:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):240 -> d
+    85:91:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):241:247 -> d
+    92:92:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():408:408 -> d
+    92:92:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):249 -> d
+    93:109:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):249:265 -> d
+    110:138:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):257:285 -> d
+    139:139:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> d
+    139:139:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):280 -> d
+    140:147:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):280:287 -> d
+    1:5:void main(java.lang.String[]):137:141 -> main
+    1:5:void run(com.android.tools.r8.D8Command):85:89 -> run
+    6:6:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
+    6:6:void run(com.android.tools.r8.D8Command):88 -> run
+    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):107:110 -> run
+    11:11:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> run
+    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):109 -> run
 com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.D8$a:
     java.util.List resources -> a
-    1:3:void <init>():372:374 -> <init>
-    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):380:382 -> accept
-    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):381:381 -> accept
-    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):380:380 -> accept
-    1:1:java.util.Collection getProgramResources():387:387 -> getProgramResources
+    1:3:void <init>():367:369 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):375:377 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):376:376 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):375:375 -> accept
+    1:1:java.util.Collection getProgramResources():382:382 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> s
     java.lang.String synthesizedClassPrefix -> v
@@ -556,7 +552,7 @@
     3:24:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,java.util.List,java.util.List,java.lang.String,boolean,boolean,int,com.android.tools.r8.graph.DexItemFactory):335:356 -> <init>
     25:33:void <init>(boolean,boolean):360:368 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):283:283 -> a
-    2:58:com.android.tools.r8.utils.InternalOptions getInternalOptions():373:429 -> a
+    2:56:com.android.tools.r8.utils.InternalOptions getInternalOptions():373:427 -> a
     1:1:com.android.tools.r8.D8Command$Builder builder():274:274 -> builder
     2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):278:278 -> builder
     1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):296:296 -> parse
@@ -589,10 +585,10 @@
     2:2:void lambda$addDexProgramData$0(byte[],com.android.tools.r8.origin.Origin):94:94 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
     1:2:void validate():197:198 -> e
-    3:45:void com.android.tools.r8.utils.Reporter.warning(java.lang.String):0:42 -> e
-    3:45:void validate():199 -> e
-    46:60:void validate():201:215 -> e
-    61:70:void validate():213:222 -> e
+    3:36:void com.android.tools.r8.utils.Reporter.warning(java.lang.String):0:33 -> e
+    3:36:void validate():199 -> e
+    37:51:void validate():201:215 -> e
+    52:61:void validate():213:222 -> e
     1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():173:173 -> f
     1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():147:147 -> getDesugarGraphConsumer
     1:17:com.android.tools.r8.D8Command makeCommand():227:243 -> m
@@ -608,7 +604,7 @@
     2:2:void <init>(com.android.tools.r8.D8Command$1):45:45 -> <init>
     1:6:void error(com.android.tools.r8.Diagnostic):49:54 -> error
     7:13:void error(com.android.tools.r8.Diagnostic):52:58 -> error
-com.android.tools.r8.D8CommandParser -> com.android.tools.r8.d:
+com.android.tools.r8.D8CommandParser -> com.android.tools.r8.c:
     java.util.Set OPTIONS_WITH_PARAMETER -> d
     java.lang.String USAGE_MESSAGE -> e
     1:103:void <clinit>():27:129 -> <clinit>
@@ -625,12 +621,14 @@
     59:62:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):232 -> a
     63:66:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):233:236 -> a
     67:70:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):235:238 -> a
-    71:117:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):230:276 -> a
-    118:118:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():66:66 -> a
-    118:118:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):279 -> a
-    119:130:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):280:291 -> 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:
+    71:97:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):230:256 -> a
+    98:104:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):255:261 -> a
+    105:121:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):260:276 -> a
+    122:122:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():66:66 -> a
+    122:122:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):279 -> a
+    123:134:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.D8Command$Builder):280:291 -> a
+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):49:49 -> <init>
@@ -640,7 +638,7 @@
     2:2:com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder builder():80:80 -> a
     1:1:java.util.Set getClassDescriptors():85:85 -> getClassDescriptors
     1:3:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:94 -> 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>():50:53 -> <init>
@@ -733,7 +731,6 @@
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.DexFilePerClassFileConsumer):160:160 -> <init>
     4:9:void <init>(java.nio.file.Path,com.android.tools.r8.DexFilePerClassFileConsumer,boolean):165:170 -> <init>
     1:1:java.lang.String access$100(java.lang.String):141:141 -> a
-    2:2:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):226:226 -> a
     1:2:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):185:186 -> accept
     3:3:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):191:191 -> accept
     4:4:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):196:196 -> accept
@@ -742,8 +739,8 @@
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():176:176 -> getDataResourceConsumer
     1:1:java.nio.file.Path internalGetOutputPath():207:207 -> internalGetOutputPath
     1:12:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):215:226 -> writeResources
-    13:20:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):218:225 -> writeResources
-    21:30:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):217:226 -> writeResources
+    13:13:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):218:218 -> writeResources
+    14:14:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):217:217 -> writeResources
 com.android.tools.r8.DexFilePerClassFileConsumer$DirectoryConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer$DirectoryConsumer:
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> c
     boolean $assertionsDisabled -> d
@@ -767,7 +764,7 @@
     6:7:void writeFile(byte[],java.nio.file.Path):309:310 -> writeResources
     6:7:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):299 -> writeResources
     8:8:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):301:301 -> writeResources
-    9:15:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):295:301 -> writeResources
+    9:9:void writeResources(java.nio.file.Path,java.util.List,java.util.Map):295:295 -> writeResources
 com.android.tools.r8.DexFilePerClassFileConsumer$ForwardingConsumer -> com.android.tools.r8.DexFilePerClassFileConsumer$ForwardingConsumer:
     com.android.tools.r8.DexFilePerClassFileConsumer EMPTY_CONSUMER -> b
     com.android.tools.r8.DexFilePerClassFileConsumer consumer -> a
@@ -789,7 +786,6 @@
     2:2:void <init>(java.nio.file.Path,boolean):133:133 -> <init>
     3:3:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer):137:137 -> <init>
     4:9:void <init>(java.nio.file.Path,com.android.tools.r8.DexIndexedConsumer,boolean):141:146 -> <init>
-    1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):201:201 -> a
     1:2:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):162:163 -> accept
     3:3:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
     3:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):163 -> accept
@@ -801,8 +797,8 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():151:151 -> getOrigin
     1:1:java.nio.file.Path internalGetOutputPath():206:206 -> internalGetOutputPath
     1:17:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):185:201 -> writeResources
-    18:30:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):188:200 -> writeResources
-    31:45:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):187:201 -> writeResources
+    18:18:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):188:188 -> writeResources
+    19:19:void writeResources(java.nio.file.Path,java.util.List,java.util.Set):187:187 -> writeResources
 com.android.tools.r8.DexIndexedConsumer$DirectoryConsumer -> com.android.tools.r8.DexIndexedConsumer$DirectoryConsumer:
     java.nio.file.Path directory -> c
     com.android.tools.r8.utils.OutputBuilder outputBuilder -> e
@@ -817,8 +813,7 @@
     3:160:boolean com.android.tools.r8.utils.FileUtils.isClassesDexFile(java.nio.file.Path):0:157 -> a
     3:160:void deleteClassesDexFiles(java.nio.file.Path):282 -> a
     161:164:void deleteClassesDexFiles(java.nio.file.Path):283:286 -> a
-    165:171:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
-    172:172:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
+    165:165:void deleteClassesDexFiles(java.nio.file.Path):280:280 -> a
     1:1:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:246 -> accept
     2:6:void prepareDirectory():272:276 -> accept
     2:6:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):248 -> accept
@@ -838,7 +833,7 @@
     7:8:void writeFile(byte[],java.nio.file.Path):306:307 -> writeResources
     7:8:void writeResources(java.nio.file.Path,java.util.List):296 -> writeResources
     9:9:void writeResources(java.nio.file.Path,java.util.List):298:298 -> writeResources
-    10:16:void writeResources(java.nio.file.Path,java.util.List):292:298 -> writeResources
+    10:10:void writeResources(java.nio.file.Path,java.util.List):292:292 -> writeResources
 com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer -> com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer:
     com.android.tools.r8.DexIndexedConsumer EMPTY_CONSUMER -> b
     com.android.tools.r8.DexIndexedConsumer consumer -> a
@@ -856,10 +851,12 @@
     1:1:void lambda$run$0(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):49:49 -> a
     2:16:java.util.Map getDistribution(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.FeatureClassMapping,com.android.tools.r8.naming.ClassNameMapper):127:141 -> a
     1:4:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):45:48 -> run
-    5:9:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):47:51 -> run
-    10:68:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):62:120 -> run
-    69:71:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):118:120 -> run
-    72:76:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):116:120 -> run
+    5:10:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String):47:52 -> run
+    11:69:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):62:120 -> run
+    70:72:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):118:120 -> run
+    73:73:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> run
+    73:73:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):116 -> run
+    74:79:void run(com.android.tools.r8.D8Command,com.android.tools.r8.utils.FeatureClassMapping,java.lang.String,java.lang.String,java.util.concurrent.ExecutorService):116:121 -> run
     1:3:void runD8ForTesting(com.android.tools.r8.D8Command,boolean):148:150 -> runD8ForTesting
 com.android.tools.r8.DiagnosticsHandler -> com.android.tools.r8.DiagnosticsHandler:
     1:4:void infounusedproguard(com.android.tools.r8.Diagnostic):46:49 -> infounusedproguard
@@ -875,10 +872,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.e:
-    1:18:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):219:236 -> a
-com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.e$a:
-com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.e$b:
+com.android.tools.r8.Disassemble -> com.android.tools.r8.d:
+    1:19:void disassemble(com.android.tools.r8.Disassemble$DisassembleCommand):219:237 -> a
+com.android.tools.r8.Disassemble$1 -> com.android.tools.r8.d$a:
+com.android.tools.r8.Disassemble$DisassembleCommand -> com.android.tools.r8.d$b:
     java.nio.file.Path outputPath -> e
     boolean useIr -> i
     com.android.tools.r8.StringResource proguardMap -> f
@@ -895,7 +892,7 @@
     1:1:java.nio.file.Path getOutputPath():183:183 -> c
     1:1:boolean useIr():191:191 -> d
     1:1:boolean useSmali():187:187 -> e
-com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.e$b$a:
+com.android.tools.r8.Disassemble$DisassembleCommand$Builder -> com.android.tools.r8.d$b$a:
     java.nio.file.Path proguardMapFile -> g
     java.nio.file.Path outputPath -> f
     boolean useSmali -> h
@@ -914,44 +911,42 @@
     com.android.tools.r8.BaseCommand$Builder self() -> d
     1:1:com.android.tools.r8.Disassemble$DisassembleCommand$Builder setProguardMapFile(java.nio.file.Path):45:45 -> d
 com.android.tools.r8.ExtractMarker -> com.android.tools.r8.ExtractMarker:
-    1:1:void <init>():30:30 -> <init>
     1:46:boolean com.android.tools.r8.utils.FileUtils.isVDexFile(java.nio.file.Path):0:45 -> a
-    1:46:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):81 -> a
-    47:56:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):82:91 -> a
-    57:67:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):83:93 -> a
-    68:68:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):61:61 -> a
-    69:74:java.util.Collection extractMarker(com.android.tools.r8.utils.AndroidApp):99:104 -> a
-    1:8:int extractDexSize(java.nio.file.Path):54:61 -> extractDexSize
-    9:11:int extractDexSize(java.nio.file.Path):59:61 -> extractDexSize
-    1:2:java.util.Collection extractMarkerFromClassProgramData(byte[]):75:76 -> extractMarkerFromClassProgramData
-    1:3:java.util.Collection extractMarkerFromDexFile(java.nio.file.Path):48:50 -> extractMarkerFromDexFile
-    1:2:java.util.Collection extractMarkerFromDexProgramData(byte[]):69:70 -> extractMarkerFromDexProgramData
+    1:46:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):80 -> a
+    47:56:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):81:90 -> a
+    57:67:void addDexResources(com.android.tools.r8.utils.AndroidApp$Builder,java.nio.file.Path):82:92 -> a
+    68:75:int extractDexSize(java.nio.file.Path):53:60 -> a
+    76:76:int extractDexSize(java.nio.file.Path):58:58 -> a
+    77:78:java.util.Collection extractMarkerFromClassProgramData(byte[]):74:75 -> a
+    79:84:java.util.Collection extractMarker(com.android.tools.r8.utils.AndroidApp):98:103 -> a
+    1:3:java.util.Collection extractMarkerFromDexFile(java.nio.file.Path):47:49 -> b
+    4:5:java.util.Collection extractMarkerFromDexProgramData(byte[]):68:69 -> b
     1:1:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):0:0 -> main
-    1:1:void main(java.lang.String[]):109 -> main
+    1:1:void main(java.lang.String[]):108 -> main
     2:2:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.builder():77:77 -> main
     2:2:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):81 -> main
-    2:2:void main(java.lang.String[]):109 -> main
+    2:2:void main(java.lang.String[]):108 -> main
     3:21:void com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[],com.android.tools.r8.ExtractMarkerCommand$Builder):87:105 -> main
     3:21:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):82 -> main
-    3:21:void main(java.lang.String[]):109 -> main
+    3:21:void main(java.lang.String[]):108 -> main
     22:22:void com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[],com.android.tools.r8.ExtractMarkerCommand$Builder):103:103 -> main
     22:22:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):82 -> main
-    22:22:void main(java.lang.String[]):109 -> main
+    22:22:void main(java.lang.String[]):108 -> main
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> main
     23:23:void com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[],com.android.tools.r8.ExtractMarkerCommand$Builder):103 -> main
     23:23:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):82 -> main
-    23:23:void main(java.lang.String[]):109 -> main
+    23:23:void main(java.lang.String[]):108 -> main
     24:24:void com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[],com.android.tools.r8.ExtractMarkerCommand$Builder):103:103 -> main
     24:24:com.android.tools.r8.ExtractMarkerCommand$Builder com.android.tools.r8.ExtractMarkerCommand.parse(java.lang.String[]):82 -> main
-    24:24:void main(java.lang.String[]):109 -> main
-    25:78:void main(java.lang.String[]):110:163 -> main
-    79:81:void main(java.lang.String[]):127:127 -> main
-    120:124:void main(java.lang.String[]):166:170 -> main
+    24:24:void main(java.lang.String[]):108 -> main
+    25:78:void main(java.lang.String[]):109:162 -> main
+    79:81:void main(java.lang.String[]):126:126 -> main
+    120:124:void main(java.lang.String[]):165:169 -> main
 com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.ExtractMarker$a:
     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.g:
+    1:2:void <init>(com.android.tools.r8.origin.Origin,int):35:36 -> <init>
+    1:1:java.lang.String part():41:41 -> part
+com.android.tools.r8.ExtractMarkerCommand -> com.android.tools.r8.f:
     java.lang.String USAGE_MESSAGE -> g
     java.util.List programFiles -> f
     boolean csv -> e
@@ -970,8 +965,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.f:
-com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.g$a:
+com.android.tools.r8.ExtractMarkerCommand$1 -> com.android.tools.r8.e:
+com.android.tools.r8.ExtractMarkerCommand$Builder -> com.android.tools.r8.f$a:
     java.util.List programFiles -> f
     boolean csv -> e
     boolean printHelp -> a
@@ -1009,7 +1004,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.h:
+com.android.tools.r8.GenerateLintFiles -> com.android.tools.r8.g:
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set parallelMethods -> f
     boolean $assertionsDisabled -> g
@@ -1028,7 +1023,7 @@
     15:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):115:122 -> a
     15:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):137 -> a
     23:28:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):139:144 -> a
-    29:29:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):224:224 -> a
+    29:29:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):221:221 -> a
     29:29:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):144 -> a
     30:33:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):147:150 -> a
     34:66:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):148:180 -> a
@@ -1058,7 +1053,7 @@
     319:323:void main(java.lang.String[]):374:378 -> a
     1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):238:238 -> b
     1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):252:252 -> c
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.h$a:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.g$a:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):189:191 -> <init>
@@ -1069,19 +1064,22 @@
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.utils.InternalOptions):40:44 -> <init>
-    1:63:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):50:112 -> a
-    64:64:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):78:78 -> a
-    65:69:java.lang.Iterable lambda$run$2(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):90:94 -> a
-    70:72: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):160:162 -> a
-    73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    73:73:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):96 -> a
-    74:75:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):97:98 -> a
+    1:38:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):50:87 -> a
+    39:39:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> a
+    39:39:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):112 -> a
+    40:40:java.util.List run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):112:112 -> a
+    41:41:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):78:78 -> a
+    42:46:java.lang.Iterable lambda$run$2(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):90:94 -> a
+    47:50: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):160:163 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    51:51:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):96 -> a
+    52:53:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):97:98 -> a
     1:13:void main(java.lang.String[]):169:181 -> main
-    1:5:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):130:134 -> run
-    6:10:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):153:157 -> run
-    11:11:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):62:62 -> run
-    11:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):156 -> run
-    12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):165:165 -> run
+    1:6:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand):130:135 -> run
+    7:11:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):153:157 -> run
+    12:12:void com.android.tools.r8.utils.ExceptionUtils.withMainDexListHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):64:64 -> run
+    12:12:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):156 -> run
+    13:13:java.util.List run(com.android.tools.r8.GenerateMainDexListCommand,java.util.concurrent.ExecutorService):165:165 -> run
 com.android.tools.r8.GenerateMainDexListCommand -> com.android.tools.r8.GenerateMainDexListCommand:
     com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> g
     java.lang.String USAGE_MESSAGE -> j
@@ -1128,7 +1126,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.i:
+com.android.tools.r8.InternalProgramOutputPathConsumer -> com.android.tools.r8.h:
 com.android.tools.r8.JdkClassFileProvider -> com.android.tools.r8.JdkClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Map descriptorToModule -> c
@@ -1161,44 +1159,47 @@
     32:32:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):157:157 -> getProgramResource
 com.android.tools.r8.L8 -> com.android.tools.r8.L8:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>():37:37 -> <init>
-    1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):77:78 -> a
-    3:4:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):90:91 -> a
-    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):52:52 -> a
-    5:5:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):91 -> a
-    6:13:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):98:105 -> a
-    14:14:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94:94 -> a
-    15:46:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):111:142 -> a
-    15:46:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):95 -> a
-    47:47:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():413:413 -> a
-    47:47:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144 -> a
-    47:47:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):95 -> a
-    48:56:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:152 -> a
-    48:56:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):95 -> a
-    57:57:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):96:96 -> a
-    58:63:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:152 -> a
-    58:63:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):95 -> a
-    64:65:void run(java.lang.String[]):158:159 -> a
-    64:65:void lambda$main$1(java.lang.String[]):181 -> a
-    66:66:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    66:66:void run(java.lang.String[]):160 -> a
-    66:66:void lambda$main$1(java.lang.String[]):181 -> a
-    67:67:void run(java.lang.String[]):161:161 -> a
-    67:67:void lambda$main$1(java.lang.String[]):181 -> a
-    68:68:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    68:68:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    68:68:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    68:68:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    68:68:void run(java.lang.String[]):160 -> a
-    68:68:void lambda$main$1(java.lang.String[]):181 -> a
-    69:73:void run(java.lang.String[]):164:168 -> a
-    69:73:void lambda$main$1(java.lang.String[]):181 -> a
-    1:5:void main(java.lang.String[]):177:181 -> main
-    1:5:void run(com.android.tools.r8.L8Command):46:50 -> run
-    6:6:void run(com.android.tools.r8.L8Command):45:45 -> run
-    7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):62:66 -> run
-    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):61:61 -> run
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>():36:36 -> <init>
+    1:2:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command):76:77 -> a
+    3:4:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):89:90 -> a
+    5:5:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):54:54 -> a
+    5:5:void 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):90 -> a
+    6:14: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):97:105 -> a
+    15:15:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):93:93 -> a
+    16:47:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):110:141 -> a
+    16:47:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94 -> a
+    48:48:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():408:408 -> a
+    48:48:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143 -> a
+    48:48:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94 -> a
+    49:57:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):143:151 -> a
+    49:57:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94 -> a
+    58:58:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):95:95 -> a
+    59:59:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> a
+    59:59:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146 -> a
+    59:59:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94 -> a
+    60:67:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146:153 -> a
+    60:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):94 -> a
+    68:69:void run(java.lang.String[]):157:158 -> a
+    68:69:void lambda$main$1(java.lang.String[]):180 -> a
+    70:70:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    70:70:void run(java.lang.String[]):159 -> a
+    70:70:void lambda$main$1(java.lang.String[]):180 -> a
+    71:71:void run(java.lang.String[]):160:160 -> a
+    71:71:void lambda$main$1(java.lang.String[]):180 -> a
+    72:72:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    72:72:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    72:72:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    72:72:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    72:72:void run(java.lang.String[]):159 -> a
+    72:72:void lambda$main$1(java.lang.String[]):180 -> a
+    73:77:void run(java.lang.String[]):163:167 -> a
+    73:77:void lambda$main$1(java.lang.String[]):180 -> a
+    1:5:void main(java.lang.String[]):176:180 -> main
+    1:5:void run(com.android.tools.r8.L8Command):45:49 -> run
+    6:6:void run(com.android.tools.r8.L8Command):44:44 -> run
+    7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):61:65 -> run
+    12:12:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):60:60 -> run
 com.android.tools.r8.L8Command -> com.android.tools.r8.L8Command:
     java.lang.String USAGE_MESSAGE -> v
     com.android.tools.r8.graph.DexItemFactory factory -> u
@@ -1212,7 +1213,7 @@
     3:20: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,java.util.List,java.util.List,int,com.android.tools.r8.graph.DexItemFactory):94:111 -> <init>
     21:25:void <init>(boolean,boolean):115:119 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:49:com.android.tools.r8.utils.InternalOptions getInternalOptions():148:196 -> a
+    1:47:com.android.tools.r8.utils.InternalOptions getInternalOptions():148:194 -> a
     1:1:com.android.tools.r8.L8Command$Builder builder():139:139 -> builder
     2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):143:143 -> builder
     1:1:com.android.tools.r8.D8Command getD8Command():46:46 -> d
@@ -1224,45 +1225,45 @@
 com.android.tools.r8.L8Command$Builder -> com.android.tools.r8.L8Command$Builder:
     java.util.List proguardConfigFiles -> v
     java.util.List proguardConfigStrings -> u
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):208:208 -> <init>
-    2:2:void <init>(com.android.tools.r8.L8Command$1):208:208 -> <init>
-    3:3:void <init>():214:214 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):218:218 -> <init>
-    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):210:211 -> <init>
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):250:250 -> addProguardConfiguration
-    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):238:238 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):244:244 -> addProguardConfigurationFiles
-    1:5:com.android.tools.r8.L8Command makeCommand():276:280 -> c
-    1:5:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():233:233 -> c
-    6:6:com.android.tools.r8.L8Command makeCommand():281 -> c
-    6:6:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    7:25:com.android.tools.r8.L8Command makeCommand():281:299 -> c
-    7:25:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    26:39:com.android.tools.r8.L8Command makeCommand():298:311 -> c
-    26:39:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    40:49:com.android.tools.r8.L8Command makeCommand():310:319 -> c
-    40:49:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    50:73:com.android.tools.r8.L8Command makeCommand():318:341 -> c
-    50:73:com.android.tools.r8.BaseCommand makeCommand():207 -> c
-    74:74:com.android.tools.r8.L8Command makeCommand():277:277 -> c
-    74:74:com.android.tools.r8.BaseCommand makeCommand():207 -> c
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.L8Command$1):206:206 -> <init>
+    2:2:void <init>(com.android.tools.r8.L8Command$1):206:206 -> <init>
+    3:3:void <init>():212:212 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):216:216 -> <init>
+    5:6:void <init>(com.android.tools.r8.DiagnosticsHandler):208:209 -> <init>
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):248:248 -> addProguardConfiguration
+    1:1:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):236:236 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.L8Command$Builder addProguardConfigurationFiles(java.util.List):242:242 -> addProguardConfigurationFiles
+    1:5:com.android.tools.r8.L8Command makeCommand():274:278 -> c
+    1:5:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    6:6:com.android.tools.r8.CompilationMode defaultCompilationMode():231:231 -> c
+    6:6:com.android.tools.r8.L8Command makeCommand():279 -> c
+    6:6:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    7:25:com.android.tools.r8.L8Command makeCommand():279:297 -> c
+    7:25:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    26:39:com.android.tools.r8.L8Command makeCommand():296:309 -> c
+    26:39:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    40:49:com.android.tools.r8.L8Command makeCommand():308:317 -> c
+    40:49:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    50:73:com.android.tools.r8.L8Command makeCommand():316:339 -> c
+    50:73:com.android.tools.r8.BaseCommand makeCommand():205 -> c
+    74:74:com.android.tools.r8.L8Command makeCommand():275:275 -> c
+    74:74:com.android.tools.r8.BaseCommand makeCommand():205 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:16:void validate():256:271 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():233:233 -> f
-    1:1:boolean isShrinking():223:223 -> isShrinking
+    1:16:void validate():254:269 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():231:231 -> f
+    1:1:boolean isShrinking():221:221 -> isShrinking
 com.android.tools.r8.L8Command$DefaultL8DiagnosticsHandler -> com.android.tools.r8.L8Command$b:
     1:1:void <init>():122:122 -> <init>
     1:5:void error(com.android.tools.r8.Diagnostic):126:130 -> error
     6:12:void error(com.android.tools.r8.Diagnostic):128:134 -> error
 com.android.tools.r8.L8Command$DesugaredLibrary -> com.android.tools.r8.L8Command$c:
     java.util.List resources -> a
-    1:3:void <init>():346:348 -> <init>
-    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):354:356 -> accept
-    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):355:355 -> accept
-    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):354:354 -> accept
-    1:1:java.util.Collection getProgramResources():361:361 -> getProgramResources
-com.android.tools.r8.L8CommandParser -> com.android.tools.r8.j:
+    1:3:void <init>():344:346 -> <init>
+    1:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):352:354 -> accept
+    4:4:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):353:353 -> accept
+    5:5:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):352:352 -> accept
+    1:1:java.util.Collection getProgramResources():359:359 -> getProgramResources
+com.android.tools.r8.L8CommandParser -> com.android.tools.r8.i:
     java.util.Set OPTIONS_WITH_PARAMETER -> d
     1:29:void <clinit>():22:50 -> <clinit>
     30:50:void <clinit>():37:57 -> <clinit>
@@ -1273,10 +1274,12 @@
     1:1:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):71:71 -> a
     2:2:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):85:85 -> a
     3:41:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):94:132 -> a
-    42:73:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):130:161 -> a
-    74:74:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():66:66 -> a
-    74:74:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):164 -> a
-    75:86:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):165:176 -> a
+    42:55:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):130:143 -> a
+    56:68:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):142:154 -> a
+    69:77:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):153:161 -> a
+    78:78:boolean com.android.tools.r8.D8CommandParser$OrderedClassFileResourceProvider$Builder.isEmpty():66:66 -> a
+    78:78:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):164 -> a
+    79:90:com.android.tools.r8.L8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.L8Command$Builder):165:176 -> a
 com.android.tools.r8.OutputMode -> com.android.tools.r8.OutputMode:
     com.android.tools.r8.OutputMode[] $VALUES -> a
     1:16:void <clinit>():11:26 -> <clinit>
@@ -1285,8 +1288,9 @@
     1:1:com.android.tools.r8.OutputMode valueOf(java.lang.String):7:7 -> valueOf
     1:1:com.android.tools.r8.OutputMode[] values():7:7 -> values
 com.android.tools.r8.ProgramResource -> com.android.tools.r8.ProgramResource:
-    1:1:com.android.tools.r8.ProgramResource fromBytes(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):52:52 -> fromBytes
-    1:1:com.android.tools.r8.ProgramResource fromFile(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path):41:41 -> fromFile
+    1:1:com.android.tools.r8.ProgramResource fromBytes(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):53:53 -> fromBytes
+    1:1:com.android.tools.r8.ProgramResource fromFile(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path):42:42 -> fromFile
+    1:3:byte[] getBytes():65:67 -> getBytes
 com.android.tools.r8.ProgramResource$1 -> com.android.tools.r8.ProgramResource$a:
 com.android.tools.r8.ProgramResource$ByteResource -> com.android.tools.r8.ProgramResource$ByteResource:
     com.android.tools.r8.origin.Origin origin -> a
@@ -1294,133 +1298,135 @@
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ProgramResource$Kind kind -> b
     byte[] bytes -> c
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set,com.android.tools.r8.ProgramResource$1):112:112 -> <init>
-    2:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):118:123 -> <init>
-    1:1:java.io.InputStream getByteStream():138:138 -> getByteStream
-    1:1:java.util.Set getClassDescriptors():143:143 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():133:133 -> getKind
-    1:1:com.android.tools.r8.origin.Origin getOrigin():128:128 -> getOrigin
+    1:1:void <clinit>():130:130 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set,com.android.tools.r8.ProgramResource$1):131:131 -> <init>
+    2:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):137:142 -> <init>
+    1:1:java.io.InputStream getByteStream():157:157 -> getByteStream
+    1:1:byte[] getBytes():162:162 -> getBytes
+    1:1:java.util.Set getClassDescriptors():167:167 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():152:152 -> getKind
+    1:1:com.android.tools.r8.origin.Origin getOrigin():147:147 -> getOrigin
 com.android.tools.r8.ProgramResource$FileResource -> com.android.tools.r8.ProgramResource$FileResource:
     com.android.tools.r8.origin.Origin origin -> a
     java.nio.file.Path file -> c
     java.util.Set classDescriptors -> d
     com.android.tools.r8.ProgramResource$Kind kind -> b
-    1:1:void <init>(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path,java.util.Set,com.android.tools.r8.ProgramResource$1):72:72 -> <init>
-    2:6:void <init>(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path,java.util.Set):78:82 -> <init>
-    1:3:java.io.InputStream getByteStream():98:100 -> getByteStream
-    1:1:java.util.Set getClassDescriptors():106:106 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource$Kind getKind():92:92 -> getKind
-    1:1:com.android.tools.r8.origin.Origin getOrigin():87:87 -> getOrigin
+    1:1:void <init>(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path,java.util.Set,com.android.tools.r8.ProgramResource$1):82:82 -> <init>
+    2:6:void <init>(com.android.tools.r8.ProgramResource$Kind,java.nio.file.Path,java.util.Set):88:92 -> <init>
+    1:3:java.io.InputStream getByteStream():108:110 -> getByteStream
+    1:3:byte[] getBytes():117:119 -> getBytes
+    1:1:java.util.Set getClassDescriptors():125:125 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource$Kind getKind():102:102 -> getKind
+    1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> getOrigin
 com.android.tools.r8.ProgramResource$Kind -> com.android.tools.r8.ProgramResource$Kind:
     com.android.tools.r8.ProgramResource$Kind[] $VALUES -> a
-    1:3:void <clinit>():30:32 -> <clinit>
-    4:4:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(java.lang.String,int):28:28 -> <init>
-    1:1:com.android.tools.r8.ProgramResource$Kind valueOf(java.lang.String):27:27 -> valueOf
-    1:1:com.android.tools.r8.ProgramResource$Kind[] values():27:27 -> values
+    1:3:void <clinit>():31:33 -> <clinit>
+    4:4:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(java.lang.String,int):29:29 -> <init>
+    1:1:com.android.tools.r8.ProgramResource$Kind valueOf(java.lang.String):28:28 -> valueOf
+    1:1:com.android.tools.r8.ProgramResource$Kind[] values():28:28 -> values
 com.android.tools.r8.R8 -> com.android.tools.r8.R8:
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():148:148 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):154:159 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):192:192 -> a
-    2:5: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):206:209 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    6: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):210 -> 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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):211:211 -> a
-    8:8:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():413:413 -> 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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):213 -> a
-    9: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):213:227 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    24:24:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):633 -> a
-    25:26:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):634:635 -> a
-    27:28:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):233:234 -> a
-    29:30:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):240:241 -> a
-    31:31:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):57:57 -> a
-    31:31:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):241 -> a
-    32:73:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):258:299 -> a
-    74:105:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):298:329 -> a
-    106:110:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):328:332 -> a
-    111:111:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):331:331 -> a
-    112:123:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):330:341 -> a
-    124:126:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):340:342 -> a
-    127:156:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):336:365 -> a
-    157:180:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:387 -> a
-    181:181:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):384:384 -> a
-    182:263:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):380:461 -> a
-    264:288:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):460:484 -> a
-    289:307:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):483:501 -> a
-    308:328:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):500:520 -> a
-    329:347:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):519:537 -> a
-    348:426:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):536:614 -> a
-    427:481:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):612:666 -> a
-    482:491:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):664:673 -> a
-    492:497:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):671:676 -> a
-    498:518:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:689 -> a
-    519:537:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):687:705 -> a
-    538:538:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):702:702 -> a
-    539:557:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):699:717 -> a
-    558:599:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):716:757 -> a
-    600:633:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):742:775 -> a
-    634:721:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):774:861 -> a
-    722:745:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):812:835 -> a
-    746:746:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):831:831 -> a
-    747:770:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):829:852 -> a
-    771:788:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):844:861 -> a
-    789:789:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):563:563 -> a
-    790:1249:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):402:861 -> a
-    1250:1252:void lambda$run$2(com.android.tools.r8.graph.DexType):303:303 -> a
-    1253:1253:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):373:373 -> a
-    1254:1258:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):627:631 -> a
-    1259:1259:void lambda$run$7(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):680:680 -> a
-    1260:1260:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$8(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):688:688 -> a
-    1261:1261:java.lang.Iterable lambda$run$9(com.android.tools.r8.graph.AppView):718:718 -> a
-    1262:1262:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):752:752 -> a
-    1263:1263:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):759:759 -> a
-    1264:1264:void lambda$run$12(java.lang.String):806:806 -> a
-    1265:1265:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):823:823 -> a
-    1266:1274:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):872:880 -> a
-    1275:1284:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):878:887 -> a
-    1285:1285:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):885:885 -> a
-    1286:1295:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):884:893 -> a
-    1296:1296:void lambda$runEnqueuer$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):895:895 -> a
-    1297:1299: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):912:914 -> a
-    1300:1328: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):913:941 -> a
-    1329:1339: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):939:949 -> a
-    1340:1345: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):948:953 -> a
-    1346:1351: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):951:956 -> a
-    1352:1352:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1352:1352: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):956 -> a
-    1353:1353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1353:1353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1353:1353: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):956 -> a
-    1354:1354: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):956:956 -> a
-    1355:1358:boolean verifyNoJarApplicationReaders(java.util.List):961:964 -> a
-    1359:1359:void lambda$run$15(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):986:986 -> a
-    1360:1360:void lambda$main$16(java.lang.String[]):1002:1002 -> a
+    1:1:void <clinit>():149:149 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):155:160 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):193:193 -> a
+    2:5: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):207:210 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    6: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):211 -> 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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):212:212 -> a
+    8:8:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():408:408 -> 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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):214 -> a
+    9: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):214:228 -> a
+    24:25:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):234:235 -> a
+    26:27:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):241:242 -> a
+    28:28:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> a
+    28:28:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):242 -> a
+    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    29:29:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):652 -> a
+    30:31:void lambda$run$5(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):653:654 -> a
+    32:83:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:310 -> a
+    84:110:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):309:335 -> a
+    111:115:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):334:338 -> a
+    116:116:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:337 -> a
+    117:128:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):336:347 -> a
+    129:131:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):346:348 -> a
+    132:161:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):342:371 -> a
+    162:194:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):370:402 -> a
+    195:195:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):399:399 -> a
+    196:277:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):395:476 -> a
+    278:306:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:503 -> a
+    307:325:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):502:520 -> a
+    326:346:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):519:539 -> a
+    347:365:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):538:556 -> a
+    366:444:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):555:633 -> a
+    445:499:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):631:685 -> a
+    500:510:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):683:693 -> a
+    511:516:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):691:696 -> a
+    517:537:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):689:709 -> a
+    538:556:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):707:725 -> a
+    557:557:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):722:722 -> a
+    558:576:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):719:737 -> a
+    577:618:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):736:777 -> a
+    619:652:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):762:795 -> a
+    653:740:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):794:881 -> a
+    741:764:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):832:855 -> a
+    765:765:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):851:851 -> a
+    766:789:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):849:872 -> a
+    790:807:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):864:881 -> a
+    808:809:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):582:583 -> a
+    810:1276:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):417:883 -> a
+    1277:1279:void lambda$run$2(com.android.tools.r8.graph.DexType):314:314 -> a
+    1280:1280:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):379:379 -> a
+    1281:1285:java.lang.Iterable lambda$run$6(com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppView):646:650 -> a
+    1286:1286:void lambda$run$7(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):700:700 -> a
+    1287:1287:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$8(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):708:708 -> a
+    1288:1288:java.lang.Iterable lambda$run$9(com.android.tools.r8.graph.AppView):738:738 -> a
+    1289:1289:void lambda$run$10(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):772:772 -> a
+    1290:1290:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):779:779 -> a
+    1291:1291:void lambda$run$12(java.lang.String):826:826 -> a
+    1292:1292:boolean lambda$run$13(com.android.tools.r8.graph.DexProgramClass):843:843 -> a
+    1293:1301:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):892:900 -> a
+    1302:1311:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):898:907 -> a
+    1312:1312:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):905:905 -> a
+    1313:1322:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):904:913 -> a
+    1323:1323:void lambda$runEnqueuer$14(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):915:915 -> a
+    1324:1326: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):932:934 -> a
+    1327:1355: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):933:961 -> a
+    1356:1366: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):959:969 -> a
+    1367:1372: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):968:973 -> a
+    1373:1378: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):971:976 -> a
+    1379:1379:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1379:1379: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):976 -> a
+    1380:1380:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1380:1380:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1380:1380: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):976 -> a
+    1381:1381: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):976:976 -> a
+    1382:1385:boolean verifyNoJarApplicationReaders(java.util.List):981:984 -> a
+    1386:1386:void lambda$run$15(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1006:1006 -> a
+    1387:1387:void lambda$main$16(java.lang.String[]):1022:1022 -> 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):245:247 -> b
-    4:5:void run(java.lang.String[]):972:973 -> b
-    6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):974 -> b
-    7:7:void run(java.lang.String[]):975:975 -> 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[]):974 -> b
-    9:16:void run(java.lang.String[]):978:985 -> b
-    17:17:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):57:57 -> b
-    17:17:void run(java.lang.String[]):985 -> b
-    18:18:void run(java.lang.String[]):988:988 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):254:254 -> c
-    1:5:void main(java.lang.String[]):998:1002 -> main
-    1:3:void run(com.android.tools.r8.R8Command):171:173 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):187:190 -> run
-    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):57:57 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):189 -> run
+    1:4:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):246:249 -> b
+    5:6:void run(java.lang.String[]):992:993 -> b
+    7:7:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
+    7:7:void run(java.lang.String[]):994 -> b
+    8:8:void run(java.lang.String[]):995:995 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
+    9:9:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
+    9:9:void run(java.lang.String[]):994 -> b
+    10:17:void run(java.lang.String[]):998:1005 -> b
+    18:18:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> b
+    18:18:void run(java.lang.String[]):1005 -> b
+    19:20:void run(java.lang.String[]):1008:1009 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):255:255 -> c
+    1:5:void main(java.lang.String[]):1018:1022 -> main
+    1:3:void run(com.android.tools.r8.R8Command):172:174 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):188:191 -> run
+    8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):59:59 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):190 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.util.List mainDexKeepRules -> r
     java.lang.String USAGE_MESSAGE -> I
@@ -1448,15 +1454,15 @@
     36:53:void <init>(boolean,boolean):782:799 -> <init>
     1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):680:680 -> a
     2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):685:685 -> a
-    3:56:com.android.tools.r8.utils.InternalOptions getInternalOptions():814:867 -> a
-    57:67:com.android.tools.r8.utils.InternalOptions getInternalOptions():864:874 -> a
-    68:78:com.android.tools.r8.utils.InternalOptions getInternalOptions():871:881 -> a
-    79:89:com.android.tools.r8.utils.InternalOptions getInternalOptions():878:888 -> a
-    90:114:com.android.tools.r8.utils.InternalOptions getInternalOptions():885:909 -> a
-    115:115:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    115:115:com.android.tools.r8.utils.InternalOptions getInternalOptions():914 -> a
-    116:134:com.android.tools.r8.utils.InternalOptions getInternalOptions():915:933 -> a
-    135:137:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):943:945 -> a
+    3:61:com.android.tools.r8.utils.InternalOptions getInternalOptions():814:872 -> a
+    62:72:com.android.tools.r8.utils.InternalOptions getInternalOptions():869:879 -> a
+    73:83:com.android.tools.r8.utils.InternalOptions getInternalOptions():876:886 -> a
+    84:94:com.android.tools.r8.utils.InternalOptions getInternalOptions():883:893 -> a
+    95:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():890:914 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    120:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():919 -> a
+    121:140:com.android.tools.r8.utils.InternalOptions getInternalOptions():920:939 -> a
+    141:143:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):949:951 -> a
     1:1:com.android.tools.r8.R8Command$Builder builder():670:670 -> builder
     2:2:void com.android.tools.r8.R8Command$Builder.<init>():117:117 -> builder
     2:2:com.android.tools.r8.R8Command$Builder builder():670 -> builder
@@ -1534,12 +1540,12 @@
     1:4:com.android.tools.r8.R8Command makeCommand():456:459 -> p
     5:5:com.android.tools.r8.R8Command makeCommand():457:457 -> p
     1:22:com.android.tools.r8.R8Command makeR8Command():463:484 -> q
-    23:567:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:544 -> q
-    23:567:com.android.tools.r8.R8Command makeR8Command():485 -> q
-    568:629:com.android.tools.r8.R8Command makeR8Command():486:547 -> q
-    630:630:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
-    630:630:com.android.tools.r8.R8Command makeR8Command():548 -> q
-    631:664:com.android.tools.r8.R8Command makeR8Command():551:584 -> q
+    23:568:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:545 -> q
+    23:568:com.android.tools.r8.R8Command makeR8Command():485 -> q
+    569:630:com.android.tools.r8.R8Command makeR8Command():486:547 -> q
+    631:631:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
+    631:631:com.android.tools.r8.R8Command makeR8Command():548 -> q
+    632:665:com.android.tools.r8.R8Command makeR8Command():551:584 -> q
     1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):268:268 -> setDesugaredLibraryKeepRuleConsumer
     1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):175:175 -> setDisableMinification
     1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):164:164 -> setDisableTreeShaking
@@ -1576,33 +1582,43 @@
     1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():644:644 -> getDataResourceProvider
     1:4:java.util.Collection getProgramResources():632:635 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):954:954 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):959:960 -> accept
-com.android.tools.r8.R8CommandParser -> com.android.tools.r8.m:
+    1:1:void <init>(com.android.tools.r8.StringConsumer):960:960 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):965:966 -> accept
+com.android.tools.r8.R8CommandParser -> com.android.tools.r8.l:
+    java.lang.String USAGE_MESSAGE -> f
     java.util.Set OPTIONS_WITH_PARAMETER -> d
-    java.lang.String USAGE_MESSAGE -> e
-    1:54:void <clinit>():19:72 -> <clinit>
-    55:89:void <clinit>() -> <clinit>
-    90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> <clinit>
-    90:90:void <clinit>():54 -> <clinit>
-    91:91:void <clinit>():52:52 -> <clinit>
-    1:1:void <init>():17:17 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):102:102 -> a
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):116:116 -> a
-    3:10:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):120:127 -> a
-    11:64:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):133:186 -> a
-    65:121:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):183:239 -> a
-com.android.tools.r8.R8CommandParser$1 -> com.android.tools.r8.k:
-com.android.tools.r8.R8CommandParser$ParseState -> com.android.tools.r8.l:
+    java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> e
+    1:57:void <clinit>():23:79 -> <clinit>
+    58:95:void <clinit>():62:99 -> <clinit>
+    96:96:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> <clinit>
+    96:96:void <clinit>():61 -> <clinit>
+    97:97:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>():21:21 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):112:112 -> a
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):126:126 -> a
+    3:10:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder):130:137 -> a
+    11:30:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):143:162 -> a
+    31:86:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):153:208 -> a
+    87:107:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):205:225 -> a
+    108:114:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):224:230 -> a
+    115:154:void parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.R8Command$Builder,com.android.tools.r8.R8CommandParser$ParseState):229:268 -> a
+    155:155:java.util.List lambda$parse$0(java.nio.file.Path):241:241 -> a
+    156:156:void addFeatureJar(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List):273:273 -> a
+    157:159:com.android.tools.r8.FeatureSplit lambda$addFeatureJar$2(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List,com.android.tools.r8.FeatureSplit$Builder):275:275 -> a
+    161:163:com.android.tools.r8.FeatureSplit lambda$addFeatureJar$2(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List,com.android.tools.r8.FeatureSplit$Builder):277:279 -> a
+    164:167:com.android.tools.r8.FeatureSplit lambda$addFeatureJar$2(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List,com.android.tools.r8.FeatureSplit$Builder):278:281 -> a
+    1:1:void lambda$parse$1(com.android.tools.r8.R8Command$Builder,java.nio.file.Path,java.util.List):269:269 -> b
+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
     com.android.tools.r8.CompilationMode mode -> a
     boolean hasDefinedApiLevel -> d
-    1:6:void <init>():43:48 -> <init>
-    7:7:void <init>(com.android.tools.r8.R8CommandParser$1):43:43 -> <init>
-    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):43:43 -> a
-    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):43:43 -> a
+    1:6:void <init>():50:55 -> <init>
+    7:7:void <init>(com.android.tools.r8.R8CommandParser$1):50:50 -> <init>
+    1:1:boolean access$100(com.android.tools.r8.R8CommandParser$ParseState):50:50 -> a
+    2:2:boolean access$102(com.android.tools.r8.R8CommandParser$ParseState,boolean):50:50 -> a
 com.android.tools.r8.ResourceException -> com.android.tools.r8.ResourceException:
     com.android.tools.r8.origin.Origin origin -> a
     1:2:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):20:21 -> <init>
@@ -1779,14 +1795,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):189:191 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:200 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):206:210 -> 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
@@ -1796,7 +1812,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
@@ -1817,7 +1833,7 @@
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.o.a:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.n.a:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -1827,20 +1843,20 @@
     261:321:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):296:356 -> a
     322:366:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):355:399 -> a
     367:370:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,int):398:401 -> a
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.p.a:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.o.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):77:80 -> a
     5:25:void writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):183:203 -> a
     5: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 -> a
     26:32: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):84:90 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.p.a$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.o.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.p.b:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.o.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.p.c:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.o.c:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -1853,54 +1869,53 @@
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):155:155 -> <init>
     2:20:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):150:168 -> <init>
     21:21:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication,java.nio.file.Path):160:160 -> <init>
-    1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> a
-    2:9:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):201:208 -> a
-    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    10:10:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):208 -> a
-    11:18:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):208:215 -> a
-    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    19:19:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):215 -> a
-    20:26:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):215:221 -> a
-    27:27:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
-    28:28:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    28:28:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202 -> a
-    29:29:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
-    30:36:com.android.tools.r8.graph.DexApplication bisect():240:246 -> a
-    37:39:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():288:290 -> a
-    37:39:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    40:40:boolean com.android.tools.r8.bisect.BisectState$Run.isBad():140:140 -> a
-    40:40:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():291 -> a
+    1:8:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):201:208 -> a
+    9:9:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    9:9:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):208 -> a
+    10:17:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):208:215 -> a
+    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    18:18:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):215 -> a
+    19:25:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):215:221 -> a
+    26:26:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
+    27:27:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    27:27:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202 -> a
+    28:28:void setPreviousResult(com.android.tools.r8.bisect.BisectOptions$Result):202:202 -> a
+    29:35:com.android.tools.r8.graph.DexApplication bisect():240:246 -> a
+    36:38:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():288:290 -> a
+    36:38:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    39:39:boolean com.android.tools.r8.bisect.BisectState$Run.isBad():140:140 -> a
+    39:39:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():291 -> a
+    39:39:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    40:40:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():292:292 -> a
     40:40:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    41:41:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():292:292 -> a
-    41:41:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    42:122:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):0:80 -> a
-    42:122:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():292 -> a
-    42:122:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    123:130:com.android.tools.r8.graph.DexApplication bisect():250:257 -> a
-    131:132:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84:85 -> a
-    131:132:com.android.tools.r8.graph.DexApplication bisect():258 -> a
-    133:139:com.android.tools.r8.graph.DexApplication bisect():258:264 -> a
-    140:141:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):280:281 -> a
-    140:141:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    142:142:boolean com.android.tools.r8.bisect.BisectState$Range.contains(int):89:89 -> a
-    142:142:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):281 -> a
+    41:121:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.sub(com.android.tools.r8.bisect.BisectState$Range):0:80 -> a
+    41:121:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():292 -> a
+    41:121:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    122:129:com.android.tools.r8.graph.DexApplication bisect():250:257 -> a
+    130:131:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.split():84:85 -> a
+    130:131:com.android.tools.r8.graph.DexApplication bisect():258 -> a
+    132:138:com.android.tools.r8.graph.DexApplication bisect():258:264 -> a
+    139:140:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):280:281 -> a
+    139:140:com.android.tools.r8.graph.DexApplication bisect():265 -> a
+    141:141:boolean com.android.tools.r8.bisect.BisectState$Range.contains(int):89:89 -> a
+    141:141:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):281 -> a
+    141:141:com.android.tools.r8.graph.DexApplication bisect():265 -> a
+    142:142:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):282:282 -> a
     142:142:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    143:143:com.android.tools.r8.graph.DexProgramClass getGoodClass(com.android.tools.r8.graph.DexProgramClass):282:282 -> a
-    143:143:com.android.tools.r8.graph.DexApplication bisect():265 -> a
-    144:153:com.android.tools.r8.graph.DexApplication bisect():267:276 -> a
-    154:154:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
-    155:155:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    155:155:com.android.tools.r8.graph.DexApplication bisect():251 -> a
-    156:156:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
-    157:157:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():294:294 -> a
-    157:157:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    158:165:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.add(com.android.tools.r8.bisect.BisectState$Range):61:68 -> a
-    158:165:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():294 -> a
-    158:165:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    166:166:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():296:296 -> a
-    166:166:com.android.tools.r8.graph.DexApplication bisect():249 -> a
-    167:168:java.util.List getSortedClasses(com.android.tools.r8.graph.DexApplication):325:326 -> a
-    169:169:int lambda$getSortedClasses$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):326:326 -> a
+    143:152:com.android.tools.r8.graph.DexApplication bisect():267:276 -> a
+    153:153:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
+    154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    154:154:com.android.tools.r8.graph.DexApplication bisect():251 -> a
+    155:155:com.android.tools.r8.graph.DexApplication bisect():251:251 -> a
+    156:156:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():294:294 -> a
+    156:156:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    157:164:com.android.tools.r8.bisect.BisectState$Range com.android.tools.r8.bisect.BisectState$Range.add(com.android.tools.r8.bisect.BisectState$Range):61:68 -> a
+    157:164:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():294 -> a
+    157:164:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    165:165:com.android.tools.r8.bisect.BisectState$Range getLastBadRange():296:296 -> a
+    165:165:com.android.tools.r8.graph.DexApplication bisect():249 -> a
+    166:167:java.util.List getSortedClasses(com.android.tools.r8.graph.DexApplication):325:326 -> a
+    168:168:int lambda$getSortedClasses$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):326:326 -> a
     1:3:com.android.tools.r8.graph.DexProgramClass getFinalClass():232:234 -> b
     4:9:java.lang.String makeSignature(com.android.tools.r8.graph.DexApplication):332:337 -> b
     1:10:void read():172:181 -> c
@@ -1911,13 +1926,13 @@
     30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
     30:30:void read():182 -> c
     31:31:void read():182:182 -> c
-    32:41:void read():180:189 -> c
+    32:32:void read():180:180 -> c
     1:7:void write():308:314 -> d
     8:10:void com.android.tools.r8.bisect.BisectState$Run.write(java.io.Writer):134:136 -> d
     8:10:void write():315 -> d
     11:16:void write():316:321 -> d
-    17:27:void write():311:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.p.c$a:
+    17:17:void write():311:311 -> d
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.o.c$a:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -1931,14 +1946,14 @@
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.p.c$b:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.o.c$b:
     boolean good -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.bisect.BisectState$Range range -> b
     1:1:void <clinit>():116:116 -> <clinit>
     1:4:void <init>(com.android.tools.r8.bisect.BisectOptions$Result,com.android.tools.r8.bisect.BisectState$Range):120:123 -> <init>
     5:9:void <init>(java.lang.String):126:130 -> <init>
-com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.q.a:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.p.a:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -2052,7 +2067,7 @@
     2:2:boolean lambda$type$0(java.lang.String):179:179 -> e
     1:1:java.util.Set getSynthesizedTypes():530:530 -> f
     1:1:java.lang.String immutableListType():185:185 -> g
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.q.b:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.p.b:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     boolean $assertionsDisabled -> i
@@ -2185,7 +2200,7 @@
     35:35:void appendType(com.android.tools.r8.graph.DexType):715:715 -> b
     1:2:void newline():679:680 -> c
     1:1:java.lang.String toString():760:760 -> toString
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.q.d:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.p.d:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -2280,12 +2295,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.q.c:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.p.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.q.e:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.p.e:
     com.android.tools.r8.ir.code.Phi phi -> q
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -2295,7 +2310,7 @@
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> h0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.q.g:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.p.g:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -2376,11 +2391,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.q.f:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.p.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.q.m:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.p.m:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -2430,8 +2445,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.q.h:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.q.i:
+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.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2439,7 +2454,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.q.j:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.p.j:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2449,7 +2464,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.q.k:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.p.k:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -2460,36 +2475,36 @@
     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.q.l:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.p.l:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.q.n.a:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.p.n.a:
     com.android.tools.r8.ir.code.NumericType type -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():21:21 -> <clinit>
     1:5:void <init>(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):34:38 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():89:89 -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):172 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):128:128 -> a
-    3:3:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):133:133 -> a
-    4:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:164 -> a
-    25:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):161:161 -> a
-    26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):158:158 -> 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):155:155 -> 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):152:152 -> a
-    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):149:149 -> a
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):171 -> a
+    91:91:void print(com.android.tools.r8.cf.CfPrinter):128:128 -> a
+    92:92:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):133:133 -> a
+    93:113:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:164 -> a
+    114:114:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):161:161 -> a
+    115:115:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):158:158 -> a
+    116:116:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):155:155 -> 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):152:152 -> 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):149:149 -> a
     1:1:boolean canThrow():138:138 -> e
-    1:13:int getAsmOpcode():97:109 -> r
-    14:14:int getAsmOpcode():107:107 -> r
-    15:15:int getAsmOpcode():105:105 -> r
-    16:16:int getAsmOpcode():103:103 -> r
-    17:17:int getAsmOpcode():101:101 -> r
-    18:18:int getAsmOpcode():99:99 -> r
-    1:1:int getAsmOpcodeTypeOffset():114:114 -> s
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():42:42 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getType():46:46 -> u
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.q.n.a$a:
+    1:13:int getAsmOpcode():97:109 -> s
+    14:14:int getAsmOpcode():107:107 -> s
+    15:15:int getAsmOpcode():105:105 -> s
+    16:16:int getAsmOpcode():103:103 -> s
+    17:17:int getAsmOpcode():101:101 -> s
+    18:18:int getAsmOpcode():99:99 -> s
+    1:1:int getAsmOpcodeTypeOffset():114:114 -> t
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():42:42 -> u
+    1:1:com.android.tools.r8.ir.code.NumericType getType():46:46 -> v
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.p.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
@@ -2499,389 +2514,392 @@
     1:5:void <clinit>():24:28 -> <clinit>
     6:6:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.q.n.b:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.p.n.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):23:23 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> a
-    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):38:41 -> 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):40:40 -> a
-    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():81:81 -> 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):48 -> a
+    1:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():0:81 -> a
+    1:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):47 -> a
+    83:83:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):23:23 -> a
+    84:84:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> a
+    85:88:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):38:41 -> a
+    89:89:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):40:40 -> a
     boolean canThrow() -> e
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.q.n.c:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.p.n.c:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.code.MemberType type -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.MemberType):26:28 -> <init>
-    1:19:int getLoadType():36:54 -> a
-    1:19:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
-    20:20:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
-    21:21:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    22:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:79 -> a
-    27:45:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):37:55 -> a
-    27:45:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
-    46:46:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):53:53 -> 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):79 -> a
-    47:47:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):48:48 -> a
-    47:47:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
-    48:48:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):46:46 -> a
-    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):79 -> a
-    49:49:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):44:44 -> 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):79 -> a
-    50:58: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
-    50:58:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
-    59:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80:86 -> a
-    66:66:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayGet():77:77 -> a
-    66:66:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):93 -> a
+    1:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayGet():0:77 -> a
+    1:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):92 -> a
+    79:97:int getLoadType():36:54 -> a
+    79:97:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
+    98:98:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
+    99:99:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
+    100:104:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):75:79 -> a
+    105:123:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):37:55 -> a
+    105:123:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    124:124:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):53:53 -> a
+    124:124:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    125:125:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):48:48 -> a
+    125:125:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    126:126:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):46:46 -> a
+    126:126:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    127:127:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):44:44 -> a
+    127:127:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    128:136: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
+    128:136:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
+    137:143:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80:86 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.ir.code.MemberType getType():32:32 -> r
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.q.n.d:
+    1:1:com.android.tools.r8.ir.code.MemberType getType():32:32 -> s
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.p.n.d:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):25:26 -> <init>
-    1:19:int getStoreType():34:52 -> a
-    1:19:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):58 -> a
-    20:20:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):58:58 -> a
-    21:21:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
-    22:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:76 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():85:85 -> a
-    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):83 -> a
+    1:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():0:85 -> a
+    1:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):82 -> a
+    87:105:int getStoreType():34:52 -> a
+    87:105:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):58 -> a
+    106:106:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):58:58 -> a
+    107:107:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
+    108:111:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:76 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.ir.code.MemberType getType():30:30 -> r
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.q.n.e:
+    1:1:com.android.tools.r8.ir.code.MemberType getType():30:30 -> s
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.p.n.e:
     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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):44:44 -> 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):55:57 -> 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):64:64 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexType):26:27 -> <init>
+    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):36:36 -> a
+    2:2:void print(com.android.tools.r8.cf.CfPrinter):41:41 -> a
+    3:3:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):46:46 -> 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):57:59 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):65:65 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> r
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.q.n.f:
+    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> s
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.p.n.f:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():23:23 -> <clinit>
     1:8:void <init>(com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.NumericType):28:35 -> <init>
-    1:1:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> a
-    2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):83:83 -> 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):88:90 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():89:89 -> 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):97 -> a
-    1:9:int getAsmOpcode():64:72 -> r
-    10:10:int getAsmOpcode():70:70 -> r
-    11:11:int getAsmOpcode():68:68 -> r
-    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():39:39 -> s
-    1:1:com.android.tools.r8.ir.code.NumericType getType():43:43 -> t
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.q.n.g:
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):96 -> a
+    91:91:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> a
+    92:92:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):83:83 -> a
+    93:95:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:90 -> a
+    1:9:int getAsmOpcode():64:72 -> s
+    10:10:int getAsmOpcode():70:70 -> s
+    11:11:int getAsmOpcode():68:68 -> s
+    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():39:39 -> t
+    1:1:com.android.tools.r8.ir.code.NumericType getType():43:43 -> u
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.p.n.g:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):24:25 -> <init>
-    1:1:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> a
-    2:23:java.lang.String getInternalName(com.android.tools.r8.naming.NamingLens):48:69 -> a
-    2:23:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34 -> a
-    24:24:java.lang.String getInternalName(com.android.tools.r8.naming.NamingLens):51:51 -> a
-    24:24:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34 -> a
-    25:25:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-    26:26:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):75:75 -> 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):80:80 -> 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):87:87 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexType):26:27 -> <init>
+    1:1:void print(com.android.tools.r8.cf.CfPrinter):41:41 -> a
+    2:23:java.lang.String getInternalName(com.android.tools.r8.naming.NamingLens):50:71 -> a
+    2:23:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):36 -> a
+    24:24:java.lang.String getInternalName(com.android.tools.r8.naming.NamingLens):53:53 -> a
+    24:24:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):36 -> a
+    25:25:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):36:36 -> a
+    26:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):77:77 -> 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):82:82 -> a
+    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):88:88 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getType():29:29 -> r
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.q.n.h:
+    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> s
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.p.n.h:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):24:25 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):44:44 -> 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):55:55 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():336:336 -> 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):63 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
+    1:323:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():0:322 -> a
+    1:323:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):63 -> a
+    324:324:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):35:35 -> a
+    325:325:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
+    326:326:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):45:45 -> a
+    327:329: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
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():29:29 -> r
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.q.n.i:
+    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> s
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.p.n.i:
     com.android.tools.r8.graph.DexProto type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexProto):24:25 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):44:44 -> 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):55:55 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():340:340 -> 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):63 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexProto):25:26 -> <init>
+    1:327:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():0:326 -> a
+    1:327:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):63 -> a
+    328:328:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):35:35 -> a
+    329:329:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
+    330:330:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):45:45 -> a
+    331:333: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
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexProto getType():29:29 -> r
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.q.n.j:
+    1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> s
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.p.n.j:
     1:1:void <init>():19:19 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):23:23 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> 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):33:33 -> a
-    4:1170:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):0:1166 -> a
-    4:1170:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):33 -> a
-    1171:1171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
-    1171:1171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):40 -> a
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.q.n.k:
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():0:106 -> a
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):39 -> a
+    108:108:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):23:23 -> a
+    109:109:void print(com.android.tools.r8.cf.CfPrinter):28:28 -> a
+    110:110:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):33:33 -> a
+    111:1277:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):0:1166 -> a
+    111:1277:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):33 -> a
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.p.n.k:
     com.android.tools.r8.ir.code.ValueType type -> b
     long value -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(long,com.android.tools.r8.ir.code.ValueType):25:27 -> <init>
-    1:53:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:112 -> a
-    54:61:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):100:107 -> a
-    62:62:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):102:102 -> a
-    63:63:boolean isNegativeZeroDouble(double):117:117 -> a
-    63:63:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):103 -> a
-    64:64:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    65:69:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):77:81 -> a
-    70:85:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):79:94 -> a
-    86:86:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):89:89 -> a
-    87:87:boolean isNegativeZeroFloat(float):121:121 -> a
-    87:87:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):90 -> a
-    88:88:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):91:91 -> a
-    89:97:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):63:71 -> a
-    98:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
-    98:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138 -> a
-    99:99:void print(com.android.tools.r8.cf.CfPrinter):126:126 -> a
-    100:100:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131:131 -> a
-    101:111:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():125:135 -> a
-    101:111:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
-    112:112:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():133:133 -> a
-    112:112:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
-    113:113:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():131:131 -> a
-    113:113:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
-    114:114:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():129:129 -> a
-    114:114:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
-    115:115:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():127:127 -> a
-    115:115:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
-    116:116:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131:131 -> a
-    1:2:double getDoubleValue():54:55 -> r
-    1:2:float getFloatValue():49:50 -> s
-    1:2:int getIntValue():39:40 -> t
-    1:2:long getLongValue():44:45 -> u
-    1:1:long getRawValue():35:35 -> v
-    1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> w
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.q.n.l:
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():0:106 -> a
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):137 -> a
+    108:160:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:112 -> a
+    161:168:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):100:107 -> a
+    169:169:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):102:102 -> a
+    170:170:boolean isNegativeZeroDouble(double):117:117 -> a
+    170:170:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):103 -> a
+    171:171:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
+    172:176:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):77:81 -> a
+    177:192:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):79:94 -> a
+    193:193:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):89:89 -> a
+    194:194:boolean isNegativeZeroFloat(float):121:121 -> a
+    194:194:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):90 -> a
+    195:195:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):91:91 -> a
+    196:204:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):63:71 -> a
+    205:205:void print(com.android.tools.r8.cf.CfPrinter):126:126 -> a
+    206:206:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131:131 -> a
+    207:217:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():125:135 -> a
+    207:217:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
+    218:218:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():133:133 -> a
+    218:218:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
+    219:219:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():131:131 -> a
+    219:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
+    220:220:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():129:129 -> a
+    220:220:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
+    221:221:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueType.toPrimitiveType():127:127 -> a
+    221:221:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131 -> a
+    222:222:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):131:131 -> a
+    1:2:double getDoubleValue():54:55 -> s
+    1:2:float getFloatValue():49:50 -> t
+    1:2:int getIntValue():39:40 -> u
+    1:2:long getLongValue():44:45 -> v
+    1:1:long getRawValue():35:35 -> w
+    1:1:com.android.tools.r8.ir.code.ValueType getType():31:31 -> x
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.p.n.l:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):22:23 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
-    1:1:void setString(com.android.tools.r8.graph.DexString):31:31 -> a
-    2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):46:46 -> a
-    3:3:void print(com.android.tools.r8.cf.CfPrinter):51:51 -> 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):62:62 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> 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):70 -> a
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():0:106 -> a
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):69 -> a
+    108:108:void setString(com.android.tools.r8.graph.DexString):31:31 -> a
+    109:109:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):46:46 -> a
+    110:110:void print(com.android.tools.r8.cf.CfPrinter):51:51 -> a
+    111:113:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):62:62 -> a
     boolean canThrow() -> e
     boolean isConstString() -> i
-    1:1:com.android.tools.r8.graph.DexString getString():27:27 -> r
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.q.n.m:
+    1:1:com.android.tools.r8.graph.DexString getString():27:27 -> s
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.p.n.m:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> b
     com.android.tools.r8.graph.DexReference item -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):26:28 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):51:51 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):57:57 -> a
-    3:5:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):68:70 -> a
-    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):76:76 -> a
-    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):94:94 -> 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):86 -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):27:29 -> <init>
+    1:95: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.DexProgramClass):0:94 -> a
+    1:95:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):86 -> a
+    96:96:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):52:52 -> a
+    97:97:void print(com.android.tools.r8.cf.CfPrinter):58:58 -> a
+    98:100:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):69:71 -> a
+    101:103:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):77:77 -> a
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
     boolean canThrow() -> e
     boolean isDexItemBasedConstString() -> j
-    1:1:com.android.tools.r8.graph.DexReference getItem():32:32 -> r
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():36:36 -> s
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.q.n.n:
+    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> s
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> t
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.p.n.n:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.DexField declaringField -> c
     boolean $assertionsDisabled -> d
     int opcode -> a
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:5:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):28:32 -> <init>
-    1:4:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):55:58 -> a
-    5:5:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
-    6:20:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):68:82 -> a
-    21:21:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):73:73 -> a
-    22:31:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):70:79 -> a
-    32:32:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):76:76 -> a
-    33:60:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93:120 -> a
-    61:63:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114:116 -> a
-    64:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:109 -> a
-    66:67:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):102:103 -> a
-    68:68:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:97 -> a
-    69:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):128:138 -> a
-    80:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):136:136 -> a
-    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):134:134 -> a
-    82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):132:132 -> 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):130:130 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:5:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):30:34 -> <init>
+    1:4:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):57:60 -> a
+    5:5:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
+    6:20:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):70:84 -> a
+    21:21:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):75:75 -> a
+    22:31:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):72:81 -> a
+    32:32:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):78:78 -> a
+    33:60:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):95:122 -> a
+    61:63:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116:118 -> a
+    64:65:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):110:111 -> a
+    66:67:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104:105 -> a
+    68:68:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):99:99 -> a
+    69:79:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):129:139 -> a
+    80:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):137:137 -> a
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):135:135 -> a
+    82:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):133:133 -> a
+    83:83:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):131:131 -> a
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
     boolean canThrow() -> e
     boolean isFieldInstruction() -> k
-    1:1:com.android.tools.r8.graph.DexField getField():36:36 -> r
-    1:1:int getOpcode():40:40 -> s
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.q.n.p:
+    1:1:com.android.tools.r8.graph.DexField getField():38:38 -> s
+    1:1:int getOpcode():42:42 -> t
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.p.n.p:
     java.util.List stack -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> a
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.List):199:203 -> <init>
-    1:1:int computeStackCount():224:224 -> a
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):216 -> a
-    2:8:java.lang.Object[] computeStackTypes(int,com.android.tools.r8.naming.NamingLens):228:234 -> a
-    2:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):217 -> a
-    9:18:int computeLocalsCount():240:249 -> a
-    9:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):218 -> a
-    19:25:java.lang.Object[] computeLocalsTypes(int,com.android.tools.r8.naming.NamingLens):260:266 -> a
-    19:25:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):219 -> a
-    26:26:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):220:220 -> a
-    27:27:void print(com.android.tools.r8.cf.CfPrinter):280:280 -> 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):286:286 -> 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):298:298 -> a
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.List):210:214 -> <init>
+    1:1:int computeStackCount():235:235 -> a
+    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):227 -> a
+    2:8:java.lang.Object[] computeStackTypes(int,com.android.tools.r8.naming.NamingLens):239:245 -> a
+    2:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):228 -> a
+    9:18:int computeLocalsCount():251:260 -> a
+    9:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):229 -> a
+    19:25:java.lang.Object[] computeLocalsTypes(int,com.android.tools.r8.naming.NamingLens):271:277 -> a
+    19:25:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):230 -> a
+    26:26:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):231:231 -> a
+    27:27:void print(com.android.tools.r8.cf.CfPrinter):291:291 -> 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):297:297 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):308:308 -> a
     boolean emitsIR() -> f
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():207:207 -> r
-    1:1:java.util.List getStack():211:211 -> s
-    1:1:java.lang.String toString():275:275 -> toString
-com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.q.n.o:
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.q.n.p$a:
-    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):27:27 -> <init>
-    2:2:void <init>():75:75 -> <init>
+    boolean isFrame() -> l
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():218:218 -> s
+    1:1:java.util.List getStack():222:222 -> t
+    1:1:java.lang.String toString():286:286 -> toString
+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:
+    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
     java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens) -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType initialized(com.android.tools.r8.graph.DexType):30:30 -> a
-    2:2:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedNew(com.android.tools.r8.cf.code.CfLabel):34:34 -> a
+    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType initialized(com.android.tools.r8.graph.DexType):31:31 -> a
+    2:2:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedNew(com.android.tools.r8.cf.code.CfLabel):35:35 -> a
     com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> b
     boolean isInitialized() -> c
     boolean isTop() -> d
     boolean isUninitializedNew() -> e
     boolean isUninitializedThis() -> f
     boolean isWide() -> g
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():42:42 -> h
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():38:38 -> i
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.q.n.q:
+    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.graph.DexType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():78:78 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):78:78 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexType):82:84 -> <init>
-    1:16:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):94:109 -> a
-    17:17:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):101:101 -> a
-    18:26:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):99:107 -> a
-    27:27:com.android.tools.r8.graph.DexType getInitializedType():125:125 -> a
+    1:1:void <clinit>():89:89 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):89:89 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType):93:95 -> <init>
+    1:16:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):105:120 -> a
+    17:17:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):112:112 -> a
+    18:26:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):110:118 -> a
+    27:27:com.android.tools.r8.graph.DexType getInitializedType():136:136 -> a
     boolean isInitialized() -> c
-    1:1:boolean isWide():115:115 -> g
-    1:1:java.lang.String toString():89:89 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.q.n.r:
+    1:1:boolean isWide():126:126 -> g
+    1:1:java.lang.String toString():100:100 -> toString
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.p.n.r:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
-    1:1:void <clinit>():131:131 -> <clinit>
-    1:1:void <init>():129:129 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):140:140 -> a
+    1:1:void <clinit>():142:142 -> <clinit>
+    1:1:void <init>():140:140 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):151:151 -> a
     boolean isTop() -> d
-    1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():129:129 -> j
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.q.n.s:
+    1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():140:140 -> j
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.p.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):149:149 -> <init>
-    2:3:void <init>(com.android.tools.r8.cf.code.CfLabel):152:153 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):163:163 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():173:173 -> b
+    1:1:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfFrame$1):160:160 -> <init>
+    2:3:void <init>(com.android.tools.r8.cf.code.CfLabel):163:164 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):174:174 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():184:184 -> b
     boolean isUninitializedNew() -> e
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.q.n.t:
-    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):177:177 -> <init>
-    2:2:void <init>():178:178 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):182:182 -> a
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.p.n.t:
+    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):188:188 -> <init>
+    2:2:void <init>():189:189 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.naming.NamingLens):193:193 -> a
     boolean isUninitializedThis() -> f
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.q.n.u:
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.p.n.u:
     com.android.tools.r8.cf.code.CfLabel target -> a
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):22:23 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):48:48 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):53:53 -> 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):58:58 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> 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 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):64 -> a
+    254:254:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):48:48 -> a
+    255:255:void print(com.android.tools.r8.cf.CfPrinter):53:53 -> a
+    256:256:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):58:58 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():43:43 -> g
-    boolean isJump() -> m
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.q.n.v:
+    boolean isJump() -> n
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.p.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
     1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):28:31 -> <init>
-    1:1:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
-    2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:73 -> a
-    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):88:91 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> 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):98 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):97 -> a
+    254:254:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
+    255:255:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:73 -> a
+    256:259:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:91 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> g
     boolean isConditionalJump() -> h
-    boolean isJump() -> m
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():39:39 -> r
-    1:15:int getOpcode():48:62 -> s
-    16:16:int getOpcode():60:60 -> s
-    17:17:int getOpcode():50:50 -> s
-    1:1:com.android.tools.r8.ir.code.ValueType getType():35:35 -> t
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.q.n.w:
+    boolean isJump() -> n
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():39:39 -> s
+    1:15:int getOpcode():48:62 -> t
+    16:16:int getOpcode():60:60 -> t
+    17:17:int getOpcode():50:50 -> t
+    1:1:com.android.tools.r8.ir.code.ValueType getType():35:35 -> u
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.p.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
     1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):28:31 -> <init>
-    1:15:int getOpcode():48:62 -> a
-    1:15:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
-    16:16:int getOpcode():60:60 -> a
-    16:16:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
-    17:17:int getOpcode():50:50 -> a
-    17:17:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
-    18:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:73 -> a
-    19:19:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
-    20:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:92 -> a
-    25:1393:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):0:1368 -> a
-    25:1393:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92 -> a
-    1394:1394:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1366:1366 -> a
-    1394:1394:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92 -> a
-    1395:1395:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> a
-    1395:1395:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):98 -> a
+    254:268:int getOpcode():48:62 -> a
+    254:268:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
+    269:269:int getOpcode():60:60 -> a
+    269:269:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
+    270:270:int getOpcode():50:50 -> a
+    270:270:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
+    271:271:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:73 -> a
+    272:272:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
+    273:277:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:92 -> a
+    278:1646:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):0:1368 -> a
+    278:1646:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92 -> a
+    1647:1647:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1366:1366 -> a
+    1647:1647:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():44:44 -> g
     boolean isConditionalJump() -> h
-    boolean isJump() -> m
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():35:35 -> r
-    1:1:com.android.tools.r8.ir.code.ValueType getType():39:39 -> s
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.q.n.x:
+    boolean isJump() -> n
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():35:35 -> s
+    1:1:com.android.tools.r8.ir.code.ValueType getType():39:39 -> t
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.p.n.x:
     int increment -> b
     int var -> a
     1:3:void <init>(int,int):23:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):30:30 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):35:35 -> 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):48:49 -> 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):56:56 -> a
-    1:1:int getIncrement():43:43 -> r
-    1:1:int getLocalIndex():39:39 -> s
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.q.n.y:
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):55:55 -> a
+    1:1:int getIncrement():43:43 -> s
+    1:1:int getLocalIndex():39:39 -> t
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.p.n.y:
     com.android.tools.r8.graph.DexType clazz -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):39:43 -> a
-    6:6:void print(com.android.tools.r8.cf.CfPrinter):48:48 -> a
-    7:7:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):53:53 -> a
-    8:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63:64 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70:70 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
+    1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):41:45 -> a
+    6:6:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> a
+    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):55:55 -> a
+    8:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):65:66 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):72:72 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getClassValue():30:30 -> r
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.q.n.z:
+    1:1:com.android.tools.r8.graph.DexType getClassValue():32:32 -> s
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.p.n.z:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):43:43 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):48:48 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):53:53 -> 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):63:65 -> 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):64:64 -> 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):72:72 -> 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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):45:45 -> a
+    2:2:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> a
+    3:3:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):55:55 -> 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):65:67 -> 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):66:66 -> a
+    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):73:73 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getType():28:28 -> r
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.q.n.A:
-    1:1:void <init>():18:18 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> s
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.p.n.A:
+    1:1:void <init>():21:21 -> <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
-    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType) -> a
+    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass) -> a
+    void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod) -> a
     void print(com.android.tools.r8.cf.CfPrinter) -> a
-    void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType) -> a
     void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens) -> a
+    1:1:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    2:2:void registerUseForDesugaring(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ClasspathMethod):39:39 -> a
     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
@@ -2892,154 +2910,155 @@
     boolean isConstString() -> i
     boolean isDexItemBasedConstString() -> j
     boolean isFieldInstruction() -> k
-    boolean isInvoke() -> l
-    boolean isJump() -> m
-    boolean isLabel() -> n
-    boolean isLoad() -> o
-    boolean isReturn() -> p
-    boolean isStore() -> q
-    1:3:java.lang.String toString():26:28 -> toString
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.q.n.B:
+    boolean isFrame() -> l
+    boolean isInvoke() -> m
+    boolean isJump() -> n
+    boolean isLabel() -> o
+    boolean isLoad() -> p
+    boolean isReturn() -> q
+    boolean isStore() -> r
+    1:3:java.lang.String toString():29:31 -> toString
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.p.n.B:
     int opcode -> b
     com.android.tools.r8.graph.DexMethod method -> a
     boolean itf -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:7:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):41:47 -> <init>
-    1:4:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):74:77 -> a
-    5:5:void print(com.android.tools.r8.cf.CfPrinter):82:82 -> a
-    6:26:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):87:107 -> a
-    27:42:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):89:104 -> a
-    43:48:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):95:100 -> a
-    49:49:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):92:92 -> a
-    50:52:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):112:114 -> a
-    53:103:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127:177 -> a
-    104:147:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:173 -> a
-    148:152:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):160:164 -> a
-    153:154:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):276:277 -> a
-    153:154:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164 -> a
-    155:159:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):302:306 -> a
-    155:159:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):277 -> a
-    155:159:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164 -> a
-    160:176:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):281:297 -> a
-    160:176:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164 -> a
-    177:177:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    177:177:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    177:177:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):297 -> a
-    177:177:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164 -> a
-    178:178:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):297:297 -> a
-    178:178:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):164 -> a
-    179:179:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):166:166 -> a
-    180:235:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):136:191 -> a
-    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):190:193 -> a
-    240:301:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):201:262 -> a
-    302:331:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):210:239 -> a
-    332:364:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):215:247 -> a
-    365:365:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    365:365:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):248 -> a
-    366:382:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):249:265 -> a
-    383:383:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLense):270:270 -> a
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:7:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):42:48 -> <init>
+    1:4:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):75:78 -> a
+    5:5:void print(com.android.tools.r8.cf.CfPrinter):83:83 -> a
+    6:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):88:108 -> a
+    27:42:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):90:105 -> a
+    43:48:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):96:101 -> a
+    49:49:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):93:93 -> a
+    50:52:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):113:115 -> a
+    53:103:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132:182 -> a
+    104:147:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):135:178 -> a
+    148:152:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):165:169 -> a
+    153:154:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):282:283 -> a
+    153:154:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
+    155:159:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):308:312 -> a
+    155:159:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):283 -> a
+    155:159:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
+    160:176:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):287:303 -> a
+    160:176:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
+    177:177:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    177:177:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):303 -> a
+    177:177:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
+    178:178:com.android.tools.r8.ir.code.Invoke$Type invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):303:303 -> a
+    178:178:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):169 -> a
+    179:179:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):171:171 -> a
+    180:235:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):141:196 -> a
+    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):195:198 -> a
+    240:303:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):205:268 -> a
+    304:334:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):214:244 -> a
+    335:369:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):219:253 -> a
+    370:370:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    370:370:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):254 -> a
+    371:387:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):255:271 -> a
+    388:388:boolean noNeedToUseGraphLense(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLense):276:276 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> d
     boolean canThrow() -> e
-    boolean isInvoke() -> l
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():51:51 -> r
-    1:1:int getOpcode():55:55 -> s
-    1:1:boolean isInterface():59:59 -> t
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.q.n.C:
+    boolean isInvoke() -> m
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():52:52 -> s
+    1:1:int getOpcode():56:56 -> t
+    1:1:boolean isInterface():60:60 -> u
+    1:1:boolean isInvokeVirtual():119:119 -> v
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.p.n.C:
     com.android.tools.r8.graph.DexCallSite callSite -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexCallSite):32:33 -> <init>
-    1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):38:42 -> a
-    6:26:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):51:71 -> a
-    6:26:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    27:27:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):68:68 -> a
-    27:27:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    28:29:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):65:66 -> a
-    28:29:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    30:32:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61:63 -> a
-    30:32:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    33:39:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):53:59 -> a
-    33:39:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    40:40:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):57:57 -> a
-    40:40:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42 -> a
-    41:46:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):42:47 -> a
-    47:47:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):46:46 -> a
-    48:48:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
-    49:49:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):86:86 -> a
-    50:52:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):96:98 -> a
-    53:237:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):0:184 -> a
-    53:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98 -> a
-    238:247:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98:107 -> a
-    248:248:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():172:172 -> a
-    248:248:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):115 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexCallSite):34:35 -> <init>
+    1:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():0:170 -> a
+    1:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):116 -> a
+    172:176:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):40:44 -> a
+    177:197:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):53:73 -> a
+    177:197:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    198:198:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):70:70 -> a
+    198:198:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    199:200:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):67:68 -> a
+    199:200:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    201:203:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):63:65 -> a
+    201:203:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    204:210:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):55:61 -> a
+    204:210:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    211:211:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):59:59 -> a
+    211:211:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44 -> a
+    212:217:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):44:49 -> a
+    218:218:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):48:48 -> a
+    219:219:void print(com.android.tools.r8.cf.CfPrinter):79:79 -> a
+    220:220:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):88:88 -> a
+    221:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98:100 -> a
+    224:408:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):0:184 -> a
+    224:408:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100 -> a
+    409:418:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100:109 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():81:81 -> r
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.q.n.D:
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():83:83 -> s
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.p.n.D:
     int local -> a
     1:2:void <init>(int):27:28 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):33:33 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):38:38 -> 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 inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):49:49 -> a
-    1:1:com.android.tools.r8.errors.CompilationError error():21:21 -> r
-    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> r
-    2:2:com.android.tools.r8.errors.CompilationError error():21 -> r
-    3:3:com.android.tools.r8.errors.CompilationError error():21:21 -> r
-    1:1:int getLocal():53:53 -> s
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.q.n.E:
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):49:49 -> a
+    1:1:com.android.tools.r8.errors.CompilationError error():21:21 -> s
+    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
+    2:2:com.android.tools.r8.errors.CompilationError error():21 -> s
+    3:3:com.android.tools.r8.errors.CompilationError error():21:21 -> s
+    1:1:int getLocal():53:53 -> t
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.p.n.E:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():18:20 -> <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):41:41 -> a
     2:2:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):46:46 -> 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):63:63 -> a
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):62:62 -> a
     boolean emitsIR() -> f
-    boolean isLabel() -> n
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():23:26 -> r
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.q.n.F:
+    boolean isLabel() -> o
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():23:26 -> s
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.p.n.F:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):26:28 -> <init>
-    1:13:int getLoadType():32:44 -> a
-    1:13:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
-    14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
-    15:15:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    16:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78:80 -> a
-    19:1277:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
-    19:1277: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
-    1278:1278:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():268:268 -> a
-    1278:1278:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):92 -> a
+    1:257:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():0:256 -> a
+    1:257:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):91 -> a
+    258:270:int getLoadType():32:44 -> a
+    258:270:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
+    271:271:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
+    272:272:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
+    273:275:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78:80 -> a
+    276:1534:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
+    276:1534: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
     boolean emitsIR() -> f
-    boolean isLoad() -> o
-    1:1:int getLocalIndex():73:73 -> r
-    1:1:com.android.tools.r8.ir.code.ValueType getType():69:69 -> s
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.q.n.G:
+    boolean isLoad() -> p
+    1:1:int getLocalIndex():73:73 -> s
+    1:1:com.android.tools.r8.ir.code.ValueType getType():69:69 -> t
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.p.n.G:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> a
     com.android.tools.r8.ir.code.NumericType type -> b
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):35:40 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():89:89 -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):144 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):103:103 -> a
-    3:3:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):108:108 -> a
-    4:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113:136 -> 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):133:133 -> a
-    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:130 -> a
-    30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127:127 -> a
-    31:31:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):124:124 -> a
-    32:32:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):121:121 -> a
-    33:33:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:118 -> a
-    1:15:int getAsmOpcode():83:97 -> r
-    16:16:int getAsmOpcode():95:95 -> r
-    17:17:int getAsmOpcode():93:93 -> r
-    18:18:int getAsmOpcode():91:91 -> r
-    19:19:int getAsmOpcode():89:89 -> r
-    20:20:int getAsmOpcode():87:87 -> r
-    21:21:int getAsmOpcode():85:85 -> r
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():48:48 -> s
-    1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> t
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.q.n.G$a:
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):143 -> a
+    91:91:void print(com.android.tools.r8.cf.CfPrinter):103:103 -> a
+    92:92:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):108:108 -> a
+    93:116:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113:136 -> 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):133:133 -> 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):130:130 -> a
+    119:119:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127:127 -> a
+    120:120:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):124:124 -> a
+    121:121:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
+    122:122:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):118:118 -> a
+    1:15:int getAsmOpcode():83:97 -> s
+    16:16:int getAsmOpcode():95:95 -> s
+    17:17:int getAsmOpcode():93:93 -> s
+    18:18:int getAsmOpcode():91:91 -> s
+    19:19:int getAsmOpcode():89:89 -> s
+    20:20:int getAsmOpcode():87:87 -> s
+    21:21:int getAsmOpcode():85:85 -> s
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():48:48 -> t
+    1:1:com.android.tools.r8.ir.code.NumericType getType():44:44 -> u
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.p.n.G$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
@@ -3050,130 +3069,130 @@
     1:6:void <clinit>():24:29 -> <clinit>
     7:7:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.q.n.H:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.p.n.H:
     com.android.tools.r8.ir.code.Monitor$Type type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):24:25 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> 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 com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():272:272 -> 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):57 -> a
+    1:261:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():0:260 -> a
+    1:261:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):56 -> a
+    262:262:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
+    263:263:void print(com.android.tools.r8.cf.CfPrinter):39:39 -> a
+    264:265: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
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():29:29 -> r
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.q.n.I:
+    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():29:29 -> s
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.p.n.I:
     com.android.tools.r8.graph.DexType type -> a
     int dimensions -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):24:26 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):39:39 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):44:44 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):49:49 -> 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):59:61 -> a
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):26:28 -> <init>
+    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):41:41 -> a
+    2:2:void print(com.android.tools.r8.cf.CfPrinter):46:46 -> a
+    3:3:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):51:51 -> 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):61:63 -> a
     7:191:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):0:184 -> a
-    7:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):61 -> a
-    192:192:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):62:62 -> a
-    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):69:69 -> a
+    7:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63 -> a
+    192:192:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):64:64 -> a
+    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):70:70 -> a
     boolean canThrow() -> e
-    1:1:int getDimensions():34:34 -> r
-    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> s
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.q.n.J:
+    1:1:int getDimensions():36:36 -> s
+    1:1:com.android.tools.r8.graph.DexType getType():32:32 -> t
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.p.n.J:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):25:26 -> <init>
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():0:318 -> a
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):85 -> a
+    320:320:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):35:35 -> a
+    321:321:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
+    322:323:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78:79 -> a
+    1:14:int getAsmOpcode():44:57 -> s
+    1:1:com.android.tools.r8.ir.code.NumericType getType():30:30 -> t
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.p.n.K:
+    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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):35:35 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> 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):78:79 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():332:332 -> 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):86 -> a
-    1:14:int getAsmOpcode():44:57 -> r
-    1:1:com.android.tools.r8.ir.code.NumericType getType():30:30 -> s
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.q.n.K:
-    com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):33:33 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):38:38 -> a
-    3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):43:43 -> 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):53:53 -> 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):60:60 -> a
+    3:3:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):45:45 -> 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):55:55 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getType():28:28 -> r
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.q.n.L:
+    1:1:com.android.tools.r8.graph.DexType getType():30:30 -> s
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.p.n.L:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType):26:28 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):68:68 -> a
-    2:20:int getPrimitiveTypeCode():36:54 -> a
-    2:20:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):69 -> a
-    21:21:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):69:69 -> a
-    22:26:java.lang.String getElementInternalName(com.android.tools.r8.naming.NamingLens):59:63 -> a
-    22:26:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):71 -> a
-    27:27:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):71:71 -> a
-    28:28:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
-    29:30:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):82:83 -> 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):94:96 -> 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):103:103 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType):28:30 -> <init>
+    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):70:70 -> a
+    2:20:int getPrimitiveTypeCode():38:56 -> a
+    2:20:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):71 -> a
+    21:21:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):71:71 -> a
+    22:26:java.lang.String getElementInternalName(com.android.tools.r8.naming.NamingLens):61:65 -> a
+    22:26:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73 -> a
+    27:27:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:73 -> a
+    28:28:void print(com.android.tools.r8.cf.CfPrinter):79:79 -> a
+    29:30:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):84:85 -> 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):96:98 -> a
+    34:34:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):104:104 -> a
     boolean canThrow() -> e
-    1:1:com.android.tools.r8.graph.DexType getType():32:32 -> r
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.q.n.M:
+    1:1:com.android.tools.r8.graph.DexType getType():34:34 -> s
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.p.n.M:
     1:1:void <init>():18:18 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):22:22 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):27:27 -> 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):32:32 -> 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):44:44 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):43:43 -> a
     boolean emitsIR() -> f
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.q.n.N:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.p.n.N:
     com.android.tools.r8.ir.code.NumericType to -> b
     com.android.tools.r8.ir.code.NumericType from -> a
     int $r8$clinit -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():21:21 -> <clinit>
     1:7:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType):26:32 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):45:45 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> 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):149:150 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():332:332 -> 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):157 -> a
-    1:53:int getAsmOpcode():54:106 -> r
-    54:101:int getAsmOpcode():56:103 -> r
-    102:110:int getAsmOpcode():84:92 -> r
-    111:119:int getAsmOpcode():73:81 -> r
-    1:1:com.android.tools.r8.ir.code.NumericType getFromType():36:36 -> s
-    1:1:com.android.tools.r8.ir.code.NumericType getToType():40:40 -> t
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.q.n.O:
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():0:318 -> a
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):156 -> a
+    320:320:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):45:45 -> a
+    321:321:void print(com.android.tools.r8.cf.CfPrinter):50:50 -> a
+    322:323:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):149:150 -> a
+    1:53:int getAsmOpcode():54:106 -> s
+    54:101:int getAsmOpcode():56:103 -> s
+    102:110:int getAsmOpcode():84:92 -> s
+    111:119:int getAsmOpcode():73:81 -> s
+    1:1:com.android.tools.r8.ir.code.NumericType getFromType():36:36 -> t
+    1:1:com.android.tools.r8.ir.code.NumericType getToType():40:40 -> u
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.p.n.O:
     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):23:25 -> <init>
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):30:30 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):35:35 -> 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):63:65 -> 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):72:72 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
     boolean emitsIR() -> f
-    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():43:43 -> r
-    1:1:com.android.tools.r8.ir.code.Position getPosition():39:39 -> s
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.q.n.P:
+    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():43:43 -> s
+    1:1:com.android.tools.r8.ir.code.Position getPosition():39:39 -> t
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.p.n.P:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):25:26 -> <init>
-    1:13:int getOpcode():34:46 -> a
-    1:13:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):57 -> a
-    14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):57:57 -> a
-    15:15:void print(com.android.tools.r8.cf.CfPrinter):62:62 -> a
-    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):72:73 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():304:304 -> 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):80 -> a
-    boolean isJump() -> m
-    boolean isReturn() -> p
-    1:1:com.android.tools.r8.ir.code.ValueType getType():30:30 -> r
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.q.n.Q:
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():0:292 -> a
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):79 -> a
+    294:306:int getOpcode():34:46 -> a
+    294:306:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):57 -> a
+    307:307:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):57:57 -> a
+    308:308:void print(com.android.tools.r8.cf.CfPrinter):62:62 -> a
+    309:310:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):72:73 -> a
+    boolean isJump() -> n
+    boolean isReturn() -> q
+    1:1:com.android.tools.r8.ir.code.ValueType getType():30:30 -> s
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.p.n.Q:
     1:1:void <init>():18:18 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):27:27 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):32:32 -> 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):42:42 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():304:304 -> 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):49 -> a
-    boolean isJump() -> m
-    boolean isReturn() -> p
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.q.n.S:
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():0:292 -> a
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):48 -> a
+    294:294:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):27:27 -> a
+    295:295:void print(com.android.tools.r8.cf.CfPrinter):32:32 -> a
+    296:296:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):42:42 -> a
+    boolean isJump() -> n
+    boolean isReturn() -> q
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.p.n.S:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -3272,7 +3291,7 @@
     7814:7814:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):254:254 -> a
     7815:7815:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1258:1258 -> a
     7815:7815:void dup1x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):254 -> a
-    7816:7816:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):320:320 -> a
+    7816:7816:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):319:319 -> a
     1:8: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):261:268 -> b
     9:1267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> b
     9:1267: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):268 -> b
@@ -3289,8 +3308,8 @@
     1275:1275:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1258:1258 -> b
     1275:1275: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):276 -> b
     boolean emitsIR() -> f
-    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():88:88 -> r
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.q.n.S$a:
+    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():88:88 -> s
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.p.n.S$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
@@ -3306,24 +3325,24 @@
     10:10:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):37:38 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):24:24 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.q.n.T:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.p.n.T:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):26:28 -> <init>
-    1:13:int getStoreType():32:44 -> a
-    1:13:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
-    14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
-    15:15:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    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):78:79 -> a
-    18:1276:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
-    18:1276:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
-    1277:1277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():320:320 -> a
-    1277:1277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):91 -> a
+    1:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():0:306 -> a
+    1:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):90 -> a
+    308:320:int getStoreType():32:44 -> a
+    308:320:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60 -> a
+    321:321:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):60:60 -> a
+    322:322:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
+    323:324:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):78:79 -> a
+    325:1583:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
+    325:1583:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79 -> a
     boolean emitsIR() -> f
-    boolean isStore() -> q
-    1:1:int getLocalIndex():73:73 -> r
-    1:1:com.android.tools.r8.ir.code.ValueType getType():69:69 -> s
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.q.n.U:
+    boolean isStore() -> r
+    1:1:int getLocalIndex():73:73 -> s
+    1:1:com.android.tools.r8.ir.code.ValueType getType():69:69 -> t
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.p.n.U:
     com.android.tools.r8.cf.code.CfLabel defaultTarget -> b
     int[] keys -> c
     java.util.List targets -> d
@@ -3331,35 +3350,35 @@
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:7:void <init>(com.android.tools.r8.cf.code.CfSwitch$Kind,com.android.tools.r8.cf.code.CfLabel,int[],java.util.List):31:37 -> <init>
-    1:12:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:84 -> a
-    13:13:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):79:79 -> a
-    14:14:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> a
-    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):96:101 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> 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):108 -> a
-    boolean isJump() -> m
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():45:45 -> r
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():49:49 -> s
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> s
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():49 -> s
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():41:41 -> t
-    1:1:java.util.List getSwitchTargets():53:53 -> u
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.q.n.U$a:
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):107 -> a
+    254:265:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):73:84 -> a
+    266:266:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):79:79 -> a
+    267:267:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> a
+    268:273:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):96:101 -> a
+    boolean isJump() -> n
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():45:45 -> s
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():49:49 -> t
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> t
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():49 -> t
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():41:41 -> u
+    1:1:java.util.List getSwitchTargets():53:53 -> v
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.p.n.U$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>():24:24 -> <clinit>
     1:1:void <init>(java.lang.String,int):24:24 -> <init>
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.q.n.V:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.p.n.V:
     1:1:void <init>():19:19 -> <init>
-    1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):28:28 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> 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):43:44 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():264:264 -> 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):51 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexProgramClass):50 -> a
+    254:254:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):28:28 -> a
+    255:255:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
+    256:257:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):43:44 -> a
     boolean canThrow() -> e
-    boolean isJump() -> m
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.q.n.W:
+    boolean isJump() -> n
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.p.n.W:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -3377,9 +3396,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddDouble2Addr -> com.android.tools.r8.code.a:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -3389,9 +3408,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddFloat -> com.android.tools.r8.code.d:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3400,9 +3419,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddFloat2Addr -> com.android.tools.r8.code.c:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -3412,9 +3431,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddInt -> com.android.tools.r8.code.f:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3423,9 +3442,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddInt2Addr -> com.android.tools.r8.code.e:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -3435,23 +3454,23 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddIntLit16 -> com.android.tools.r8.code.g:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddIntLit8 -> com.android.tools.r8.code.h:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddLong -> com.android.tools.r8.code.j:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -3460,9 +3479,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AddLong2Addr -> com.android.tools.r8.code.i:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -3472,9 +3491,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Aget -> com.android.tools.r8.code.k:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3483,10 +3502,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetBoolean -> com.android.tools.r8.code.l:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3495,10 +3514,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetByte -> com.android.tools.r8.code.m:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3507,10 +3526,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetChar -> com.android.tools.r8.code.n:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3519,10 +3538,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetObject -> com.android.tools.r8.code.o:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -3531,10 +3550,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetShort -> com.android.tools.r8.code.p:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3543,10 +3562,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AgetWide -> com.android.tools.r8.code.q:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3555,10 +3574,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndInt -> com.android.tools.r8.code.s:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3567,9 +3586,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndInt2Addr -> com.android.tools.r8.code.r:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -3579,23 +3598,23 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndIntLit16 -> com.android.tools.r8.code.t:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndIntLit8 -> com.android.tools.r8.code.u:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndLong -> com.android.tools.r8.code.w:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3604,9 +3623,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AndLong2Addr -> com.android.tools.r8.code.v:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -3616,9 +3635,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Aput -> com.android.tools.r8.code.x:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3627,10 +3646,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputBoolean -> com.android.tools.r8.code.y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3639,10 +3658,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputByte -> com.android.tools.r8.code.z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3651,10 +3670,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputChar -> com.android.tools.r8.code.A:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3663,10 +3682,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputObject -> com.android.tools.r8.code.B:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3675,10 +3694,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputShort -> com.android.tools.r8.code.C:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3687,10 +3706,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.AputWide -> com.android.tools.r8.code.D:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -3699,10 +3718,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ArrayLength -> com.android.tools.r8.code.E:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -3712,36 +3731,37 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Base1Format -> com.android.tools.r8.code.F:
     1:1:void <init>(com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-    int getSize() -> m
+    int getSize() -> n
 com.android.tools.r8.code.Base2Format -> com.android.tools.r8.code.G:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> m
+    int getSize() -> n
 com.android.tools.r8.code.Base3Format -> com.android.tools.r8.code.H:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> m
+    int getSize() -> n
 com.android.tools.r8.code.Base4Format -> com.android.tools.r8.code.I:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> m
+    int getSize() -> n
 com.android.tools.r8.code.Base5Format -> com.android.tools.r8.code.J:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> m
+    int getSize() -> n
 com.android.tools.r8.code.BaseInstructionFactory -> com.android.tools.r8.code.K:
     1:1:void <init>():8:8 -> <init>
 com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.code.L:
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.M:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):22:22 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():51:51 -> B
     1:1:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
     2:3:void com.android.tools.r8.code.Format21c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):35:36 -> a
     2:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):11 -> a
@@ -3750,12 +3770,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isCheckCast() -> q
-    1:1:com.android.tools.r8.graph.DexType getType():51:51 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isCheckCast() -> r
 com.android.tools.r8.code.CmpLong -> com.android.tools.r8.code.N:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
@@ -3764,9 +3783,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):10:10 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.CmpgDouble -> com.android.tools.r8.code.O:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
@@ -3775,9 +3794,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):10:10 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.CmpgFloat -> com.android.tools.r8.code.P:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
@@ -3786,9 +3805,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):10:10 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.CmplDouble -> com.android.tools.r8.code.Q:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
@@ -3797,9 +3816,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):10:10 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.CmplFloat -> com.android.tools.r8.code.S:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
@@ -3808,9 +3827,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):10:10 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):10:10 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Const -> com.android.tools.r8.code.V:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -3821,9 +3840,9 @@
     4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     7:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Const16 -> com.android.tools.r8.code.T:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -3837,9 +3856,9 @@
     5:5:int decodedValue():43:43 -> a
     6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:56 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Const4 -> com.android.tools.r8.code.U:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -3850,12 +3869,13 @@
     3:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstClass -> com.android.tools.r8.code.W:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):22:22 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> B
     1:1:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
     2:3:void com.android.tools.r8.code.Format21c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):35:36 -> a
     2:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):11 -> a
@@ -3865,12 +3885,11 @@
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     com.android.tools.r8.code.ConstClass asConstClass() -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isConstClass() -> r
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isConstClass() -> s
 com.android.tools.r8.code.ConstHigh16 -> com.android.tools.r8.code.X:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -3884,9 +3903,9 @@
     5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstMethodHandle -> com.android.tools.r8.code.Y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23:23 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethodHandle):27:27 -> <init>
@@ -3903,10 +3922,10 @@
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):16 -> a
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):76:76 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):51:51 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstMethodType -> com.android.tools.r8.code.Z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):22:22 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexProto):26:26 -> <init>
@@ -3922,13 +3941,14 @@
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):15 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):74:74 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):50:50 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstString -> com.android.tools.r8.code.a0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):21:21 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexString):25:25 -> <init>
+    1:1:com.android.tools.r8.graph.DexString getString():29:29 -> B
     1:1:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
     2:2:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):14 -> a
@@ -3939,15 +3959,15 @@
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):78:78 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
     com.android.tools.r8.code.ConstString asConstString() -> c
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isConstString() -> s
-    1:1:com.android.tools.r8.graph.DexString getString():29:29 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isConstString() -> t
 com.android.tools.r8.code.ConstStringJumbo -> com.android.tools.r8.code.b0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexString):22:22 -> <init>
+    1:1:com.android.tools.r8.graph.DexString getString():26:26 -> B
     1:2:void com.android.tools.r8.code.Format31c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):37:38 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):11 -> a
     3:3:void com.android.tools.r8.code.Instruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):119:119 -> a
@@ -3962,12 +3982,11 @@
     252:252:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):66:66 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> b
     com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> d
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isConstStringJumbo() -> t
-    1:1:com.android.tools.r8.graph.DexString getString():26:26 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isConstStringJumbo() -> u
 com.android.tools.r8.code.ConstWide -> com.android.tools.r8.code.e0:
     short com.android.tools.r8.code.Format51l.AA -> e
     long com.android.tools.r8.code.Format51l.BBBBBBBBBBBBBBBB -> f
@@ -3996,9 +4015,9 @@
     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
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 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>
@@ -4012,9 +4031,9 @@
     5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstWide32 -> com.android.tools.r8.code.d0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4025,9 +4044,9 @@
     4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     7:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ConstWideHigh16 -> com.android.tools.r8.code.f0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4041,9 +4060,9 @@
     5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DexInitClass -> com.android.tools.r8.code.g0:
     boolean $assertionsDisabled -> g
     int dest -> e
@@ -4062,17 +4081,18 @@
     29:29:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):118:118 -> a
     1:7:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):123:129 -> b
     1:5:boolean equals(java.lang.Object):109:113 -> equals
-    boolean canThrow() -> f
+    boolean canThrow() -> g
     1:1:int hashCode():104:104 -> hashCode
-    java.lang.String getName() -> i
-    1:1:int getOpcode():63:63 -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    1:1:int getOpcode():63:63 -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DexItemBasedConstString -> com.android.tools.r8.code.h0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> h
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):24:25 -> <init>
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():33:33 -> A
+    1:1:com.android.tools.r8.graph.DexReference getItem():29:29 -> B
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():33:33 -> C
     1:1:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):15 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):71:71 -> a
@@ -4087,12 +4107,11 @@
     10:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):90:90 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):65:65 -> b
     com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> e
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    1:1:int getOpcode():48:48 -> k
-    java.lang.String getSmaliName() -> n
-    boolean isDexItemBasedConstString() -> u
-    1:1:com.android.tools.r8.graph.DexReference getItem():29:29 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    1:1:int getOpcode():48:48 -> l
+    java.lang.String getSmaliName() -> o
+    boolean isDexItemBasedConstString() -> v
 com.android.tools.r8.code.DivDouble -> com.android.tools.r8.code.j0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -4101,9 +4120,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivDouble2Addr -> com.android.tools.r8.code.i0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4113,9 +4132,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivFloat -> com.android.tools.r8.code.l0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -4124,9 +4143,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivFloat2Addr -> com.android.tools.r8.code.k0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4136,9 +4155,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivInt -> com.android.tools.r8.code.n0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -4147,10 +4166,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivInt2Addr -> com.android.tools.r8.code.m0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4160,26 +4179,26 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivIntLit16 -> com.android.tools.r8.code.o0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivIntLit8 -> com.android.tools.r8.code.p0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivLong -> com.android.tools.r8.code.r0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -4188,10 +4207,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DivLong2Addr -> com.android.tools.r8.code.q0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4201,10 +4220,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DoubleToFloat -> com.android.tools.r8.code.s0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4214,9 +4233,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DoubleToInt -> com.android.tools.r8.code.t0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4226,9 +4245,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.DoubleToLong -> com.android.tools.r8.code.u0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4238,9 +4257,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FillArrayData -> com.android.tools.r8.code.v0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
@@ -4249,10 +4268,10 @@
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):45:45 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FillArrayDataPayload -> com.android.tools.r8.code.w0:
     short[] data -> h
     boolean $assertionsDisabled -> i
@@ -4276,28 +4295,28 @@
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):80:80 -> b
     1:6:boolean equals(java.lang.Object):56:61 -> equals
     1:4:int hashCode():66:69 -> hashCode
-    1:1:int getSize():75:75 -> m
-    boolean isPayload() -> w
+    1:1:int getSize():75:75 -> n
+    boolean isPayload() -> y
 com.android.tools.r8.code.FilledNewArray -> com.android.tools.r8.code.x0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType,int,int,int,int,int):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FilledNewArrayRange -> com.android.tools.r8.code.y0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):17:17 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):21:21 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():40:40 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FloatToDouble -> com.android.tools.r8.code.z0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4307,9 +4326,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FloatToInt -> com.android.tools.r8.code.A0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4319,9 +4338,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.FloatToLong -> com.android.tools.r8.code.B0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4331,9 +4350,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Format10x -> com.android.tools.r8.code.C0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
@@ -4417,7 +4436,8 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):23:25 -> <init>
     4:8:void <init>(int,int):28:32 -> <init>
-    com.android.tools.r8.ir.code.If$Type getType() -> A
+    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> B
+    com.android.tools.r8.ir.code.If$Type getType() -> C
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):37:38 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):97:97 -> a
@@ -4427,8 +4447,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):73:73 -> b
     1:5:boolean equals(java.lang.Object):48:52 -> equals
     1:1:int hashCode():43:43 -> hashCode
-    1:1:int[] getTargets():61:61 -> o
-    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> z
+    1:1:int[] getTargets():61:61 -> p
 com.android.tools.r8.code.Format22b -> com.android.tools.r8.code.K0:
     short AA -> e
     short BB -> f
@@ -4483,7 +4502,8 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):24:27 -> <init>
     5:11:void <init>(int,int,int):30:36 -> <init>
-    com.android.tools.r8.ir.code.If$Type getType() -> A
+    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> B
+    com.android.tools.r8.ir.code.If$Type getType() -> C
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):41:42 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):97:97 -> a
@@ -4493,8 +4513,7 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):77:77 -> b
     1:5:boolean equals(java.lang.Object):52:56 -> equals
     1:1:int hashCode():47:47 -> hashCode
-    1:1:int[] getTargets():65:65 -> o
-    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> z
+    1:1:int[] getTargets():65:65 -> p
 com.android.tools.r8.code.Format22x -> com.android.tools.r8.code.O0:
     short AA -> e
     boolean $assertionsDisabled -> g
@@ -4529,7 +4548,7 @@
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):28:29 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):52:52 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):47:47 -> b
-    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):195:195 -> b
+    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):203:203 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):47 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):47:47 -> b
     1:4:boolean equals(java.lang.Object):39:42 -> equals
@@ -4572,8 +4591,8 @@
     1:1:void setPayloadOffset(int):49:49 -> c
     1:5:boolean equals(java.lang.Object):59:63 -> equals
     1:1:int hashCode():54:54 -> hashCode
-    1:1:int getPayloadOffset():45:45 -> l
-    boolean hasPayload() -> p
+    1:1:int getPayloadOffset():45:45 -> m
+    boolean hasPayload() -> q
 com.android.tools.r8.code.Format32x -> com.android.tools.r8.code.U0:
     int BBBB -> f
     boolean $assertionsDisabled -> g
@@ -4649,10 +4668,10 @@
     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
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.X0:
     short com.android.tools.r8.code.Format20t.AAAA -> e
     boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> f
@@ -4676,10 +4695,10 @@
     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
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.Goto32 -> com.android.tools.r8.code.Y0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -4690,191 +4709,191 @@
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):47:47 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):195:195 -> b
+    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):203:203 -> b
     2:2:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):47 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
     3:3:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):47:47 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():39:39 -> o
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.IfEq -> com.android.tools.r8.code.a1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfEqz -> com.android.tools.r8.code.b1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfGe -> com.android.tools.r8.code.c1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfGez -> com.android.tools.r8.code.d1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfGt -> com.android.tools.r8.code.e1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfGtz -> com.android.tools.r8.code.f1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfLe -> com.android.tools.r8.code.g1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfLez -> com.android.tools.r8.code.h1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfLt -> com.android.tools.r8.code.i1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfLtz -> com.android.tools.r8.code.j1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfNe -> com.android.tools.r8.code.k1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IfNez -> com.android.tools.r8.code.l1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> A
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> z
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> B
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> C
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Iget -> com.android.tools.r8.code.m1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetBoolean -> com.android.tools.r8.code.n1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetByte -> com.android.tools.r8.code.o1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetChar -> com.android.tools.r8.code.p1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetObject -> com.android.tools.r8.code.q1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):47:47 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetShort -> com.android.tools.r8.code.r1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):47:47 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IgetWide -> com.android.tools.r8.code.s1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):47:47 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():42:42 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InstanceOf -> com.android.tools.r8.code.t1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):22:22 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> B
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Instruction -> com.android.tools.r8.code.u1:
     int[] EXIT_TARGET -> c
     com.android.tools.r8.code.Instruction[] EMPTY_ARRAY -> b
@@ -4883,6 +4902,7 @@
     1:5:void <clinit>():21:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.code.BytecodeStream):29:31 -> <init>
     4:5:void <init>():34:35 -> <init>
+    boolean isSwitchPayload() -> A
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     short combineBytes(int,int) -> a
@@ -4898,53 +4918,54 @@
     7:8:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):112:113 -> a
     9:9:void write16BitValue(int,java.nio.ShortBuffer):97:97 -> a
     9:9:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):114 -> a
-    10:10:java.lang.String formatRelativeOffset(int):203:203 -> a
-    11:11:java.lang.String formatOffset(int):195:195 -> a
-    11:11:java.lang.String formatRelativeOffset(int):203 -> a
-    12:12:java.lang.String formatRelativeOffset(int):203:203 -> a
-    13:13:java.lang.String formatDecimalOffset(int):199:199 -> a
-    13:13:java.lang.String formatRelativeOffset(int):203 -> a
-    14:14:java.lang.String formatRelativeOffset(int):203:203 -> a
-    15:23:java.lang.String formatSmaliString(java.lang.String):216:224 -> a
-    24:24:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):264:264 -> a
-    25:25:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):276:276 -> a
+    10:10:java.lang.String formatRelativeOffset(int):211:211 -> a
+    11:11:java.lang.String formatOffset(int):203:203 -> a
+    11:11:java.lang.String formatRelativeOffset(int):211 -> a
+    12:12:java.lang.String formatRelativeOffset(int):211:211 -> a
+    13:13:java.lang.String formatDecimalOffset(int):207:207 -> a
+    13:13:java.lang.String formatRelativeOffset(int):211 -> a
+    14:14:java.lang.String formatRelativeOffset(int):211:211 -> a
+    15:23:java.lang.String formatSmaliString(java.lang.String):224:232 -> a
+    24:24:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):272:272 -> a
+    25:25:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):284:284 -> a
     com.android.tools.r8.code.ConstClass asConstClass() -> b
     int makeByte(int,int) -> b
     java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper) -> b
     1:2:long read32BitValue(com.android.tools.r8.code.BytecodeStream):63:64 -> b
     3:3:void setOffset(int):127:127 -> b
-    4:5:java.lang.String formatString(java.lang.String):207:208 -> b
-    6:6:java.lang.String formatOffset(int):195:195 -> b
-    6:6:java.lang.String formatString(java.lang.String):208 -> b
-    7:11:java.lang.String formatString(java.lang.String):208:212 -> b
+    4:5:java.lang.String formatString(java.lang.String):215:216 -> b
+    6:6:java.lang.String formatOffset(int):203:203 -> b
+    6:6:java.lang.String formatString(java.lang.String):216 -> b
+    7:11:java.lang.String formatString(java.lang.String):216:220 -> b
     com.android.tools.r8.code.ConstString asConstString() -> c
     1:1:short read8BitValue(com.android.tools.r8.code.BytecodeStream):43:43 -> c
     com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> d
     1:1:short readSigned16BitValue(com.android.tools.r8.code.BytecodeStream):48:48 -> d
     com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> e
     1:2:int readSigned32BitValue(com.android.tools.r8.code.BytecodeStream):56:57 -> e
-    boolean canThrow() -> f
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> f
     1:1:byte readSigned8BitValue(com.android.tools.r8.code.BytecodeStream):39:39 -> f
-    com.android.tools.r8.graph.DexField getField() -> g
-    com.android.tools.r8.graph.DexMethod getMethod() -> h
-    java.lang.String getName() -> i
-    1:1:int getOffset():123:123 -> j
-    int getOpcode() -> k
-    int getPayloadOffset() -> l
-    int getSize() -> m
-    java.lang.String getSmaliName() -> n
-    int[] getTargets() -> o
-    boolean hasPayload() -> p
-    boolean isCheckCast() -> q
-    boolean isConstClass() -> r
-    boolean isConstString() -> s
-    boolean isConstStringJumbo() -> t
-    1:1:java.lang.String toString():281:281 -> toString
-    boolean isDexItemBasedConstString() -> u
-    boolean isIntSwitch() -> v
-    boolean isPayload() -> w
-    1:1:boolean isSimpleNop():167:167 -> x
-    boolean isSwitchPayload() -> y
+    boolean canThrow() -> g
+    com.android.tools.r8.graph.DexField getField() -> h
+    com.android.tools.r8.graph.DexMethod getMethod() -> i
+    java.lang.String getName() -> j
+    1:1:int getOffset():123:123 -> k
+    int getOpcode() -> l
+    int getPayloadOffset() -> m
+    int getSize() -> n
+    java.lang.String getSmaliName() -> o
+    int[] getTargets() -> p
+    boolean hasPayload() -> q
+    boolean isCheckCast() -> r
+    boolean isConstClass() -> s
+    boolean isConstString() -> t
+    1:1:java.lang.String toString():289:289 -> toString
+    boolean isConstStringJumbo() -> u
+    boolean isDexItemBasedConstString() -> v
+    boolean isIntSwitch() -> w
+    boolean isInvokeVirtual() -> x
+    boolean isPayload() -> y
+    1:1:boolean isSimpleNop():175:175 -> z
 com.android.tools.r8.code.InstructionFactory -> com.android.tools.r8.code.v1:
     1:1:void <init>():11:11 -> <init>
     1:4:com.android.tools.r8.code.Instruction[] readSequenceFrom(java.nio.ShortBuffer,int,int,com.android.tools.r8.graph.OffsetToObjectMapping):22:25 -> a
@@ -5654,9 +5675,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IntToChar -> com.android.tools.r8.code.x1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5666,9 +5687,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IntToDouble -> com.android.tools.r8.code.y1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5678,9 +5699,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IntToFloat -> com.android.tools.r8.code.z1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -5690,9 +5711,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IntToLong -> com.android.tools.r8.code.A1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5702,9 +5723,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IntToShort -> com.android.tools.r8.code.B1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5714,24 +5735,24 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeCustom -> com.android.tools.r8.code.C1:
     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.IndexedDexItem,int,int,int,int,int):23:23 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():48:48 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1497:1513 -> a
-    3:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53 -> a
-    20:20:com.android.tools.r8.graph.DexCallSite getCallSite():48:48 -> a
-    20:20:void registerUse(com.android.tools.r8.graph.UseRegistry):43 -> a
-    21:21:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    3:1516:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):0:1513 -> a
+    3:1516:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53 -> a
+    1517:1517:com.android.tools.r8.graph.DexCallSite getCallSite():48:48 -> a
+    1517:1517:void registerUse(com.android.tools.r8.graph.UseRegistry):43 -> a
+    1518:1518:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeCustomRange -> com.android.tools.r8.code.D1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexCallSite):22:22 -> <init>
@@ -5741,50 +5762,50 @@
     3:3:com.android.tools.r8.graph.DexCallSite getCallSite():42:42 -> a
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry):47 -> a
     4:4:void registerUse(com.android.tools.r8.graph.UseRegistry):47:47 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeDirect -> com.android.tools.r8.code.E1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):44:44 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeDirectRange -> com.android.tools.r8.code.F1:
     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,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():43:43 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():43:43 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeInterface -> com.android.tools.r8.code.G1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):44:44 -> a
     2:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeInterfaceRange -> com.android.tools.r8.code.H1:
     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,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokePolymorphic -> com.android.tools.r8.code.I1:
     boolean com.android.tools.r8.code.Format45cc.$assertionsDisabled -> m
     byte com.android.tools.r8.code.Format45cc.G -> j
@@ -5801,6 +5822,7 @@
     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:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():151:151 -> B
     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
@@ -5811,16 +5833,16 @@
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):33:33 -> a
     6:6:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92:92 -> a
     6:6:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
+    7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> a
     7:7:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92 -> a
     7: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:8:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76:76 -> a
-    8:8:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> a
+    8:8:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77:77 -> a
+    8:8:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> a
     8:8:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92 -> a
     8:8:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     9:254:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> a
-    9:254:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76 -> a
-    9:254:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> a
+    9:254:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77 -> a
+    9:254:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> a
     9:254:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):92 -> a
     9:254:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     255:255:void com.android.tools.r8.code.Format45cc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):93:93 -> a
@@ -5840,14 +5862,13 @@
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
     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
+    boolean canThrow() -> g
     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
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():151:151 -> z
+    com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod() -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokePolymorphicRange -> com.android.tools.r8.code.J1:
     com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.HHHH -> h
     short com.android.tools.r8.code.Format4rcc.AA -> e
@@ -5881,16 +5902,16 @@
     12:19:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
     20:20:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98:98 -> a
     20:20:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
-    21:21:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
+    21:21:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> a
     21:21:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
     21: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:22:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76:76 -> a
-    22:22:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> a
+    22:22:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77:77 -> a
+    22:22:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> a
     22:22:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
     22:22:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     23:268:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> a
-    23:268:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76 -> a
-    23:268:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> a
+    23:268:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77 -> a
+    23:268:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> a
     23:268:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):98 -> a
     23:268:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0 -> a
     269:269:void com.android.tools.r8.code.Format4rcc.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):99:99 -> a
@@ -5900,143 +5921,145 @@
     1:14:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
     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
+    boolean canThrow() -> g
     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:1:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeStatic -> com.android.tools.r8.code.K1:
     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>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeStaticRange -> com.android.tools.r8.code.L1:
     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,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeSuper -> com.android.tools.r8.code.M1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):20:20 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.IndexedDexItem,int,int,int,int,int):24:24 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):44:44 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:54 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():49:49 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeSuperRange -> com.android.tools.r8.code.N1:
     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,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.InvokeVirtual -> com.android.tools.r8.code.O1:
     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>
-    1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
-    2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):53:53 -> a
+    2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> f
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():58:58 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isInvokeVirtual() -> x
 com.android.tools.r8.code.InvokeVirtualRange -> com.android.tools.r8.code.P1:
     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,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):43:43 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> h
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():48:48 -> i
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Iput -> com.android.tools.r8.code.Q1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputBoolean -> com.android.tools.r8.code.R1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputByte -> com.android.tools.r8.code.S1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputChar -> com.android.tools.r8.code.T1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputObject -> com.android.tools.r8.code.U1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputShort -> com.android.tools.r8.code.V1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.IputWide -> com.android.tools.r8.code.W1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.LongToDouble -> com.android.tools.r8.code.X1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6046,9 +6069,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.LongToFloat -> com.android.tools.r8.code.Y1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6058,9 +6081,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.LongToInt -> com.android.tools.r8.code.Z1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6070,9 +6093,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MonitorEnter -> com.android.tools.r8.code.a2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6082,10 +6105,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MonitorExit -> com.android.tools.r8.code.b2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6095,10 +6118,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Move -> com.android.tools.r8.code.d2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6108,9 +6131,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Move16 -> com.android.tools.r8.code.c2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6119,9 +6142,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveException -> com.android.tools.r8.code.e2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6131,9 +6154,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveFrom16 -> com.android.tools.r8.code.f2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6146,9 +6169,9 @@
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveObject -> com.android.tools.r8.code.h2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6157,12 +6180,12 @@
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):33:33 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1258:1258 -> a
-    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
+    4:1262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
+    4:1262:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveObject16 -> com.android.tools.r8.code.g2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6170,12 +6193,12 @@
     1:1:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1258:1258 -> a
-    4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
+    4:1262:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
+    4:1262:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveObjectFrom16 -> com.android.tools.r8.code.i2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6187,12 +6210,12 @@
     4:4:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):35 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1258:1258 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
+    6:1264:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1258 -> a
+    6:1264:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveResult -> com.android.tools.r8.code.j2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):14:14 -> <init>
     2:2:void <init>(int):18:18 -> <init>
@@ -6202,9 +6225,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):7 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):7:7 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveResultObject -> com.android.tools.r8.code.k2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6214,9 +6237,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveResultWide -> com.android.tools.r8.code.l2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6226,9 +6249,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveWide -> com.android.tools.r8.code.n2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6238,9 +6261,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveWide16 -> com.android.tools.r8.code.m2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6249,9 +6272,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MoveWideFrom16 -> com.android.tools.r8.code.o2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6264,9 +6287,9 @@
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulDouble -> com.android.tools.r8.code.q2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -6277,9 +6300,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulDouble2Addr -> com.android.tools.r8.code.p2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6289,9 +6312,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulFloat -> com.android.tools.r8.code.s2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -6302,9 +6325,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulFloat2Addr -> com.android.tools.r8.code.r2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6314,9 +6337,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulInt -> com.android.tools.r8.code.u2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():8:8 -> <clinit>
@@ -6327,9 +6350,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulInt2Addr -> com.android.tools.r8.code.t2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6339,23 +6362,23 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulIntLit16 -> com.android.tools.r8.code.v2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulIntLit8 -> com.android.tools.r8.code.w2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulLong -> com.android.tools.r8.code.y2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -6366,9 +6389,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.MulLong2Addr -> com.android.tools.r8.code.x2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6378,9 +6401,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NegDouble -> com.android.tools.r8.code.z2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6390,9 +6413,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NegFloat -> com.android.tools.r8.code.A2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6402,9 +6425,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NegInt -> com.android.tools.r8.code.B2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6414,9 +6437,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NegLong -> com.android.tools.r8.code.C2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6426,9 +6449,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NewArray -> com.android.tools.r8.code.D2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):22:22 -> <init>
@@ -6439,13 +6462,14 @@
     4:4:com.android.tools.r8.graph.DexType getType():46:46 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51 -> a
     5:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):51:51 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NewInstance -> com.android.tools.r8.code.E2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):22:22 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> B
     1:1:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> a
     2:3:void com.android.tools.r8.code.Format21c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):35:36 -> a
     2:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):11 -> a
@@ -6454,11 +6478,10 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> z
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Nop -> com.android.tools.r8.code.F2:
     int $r8$clinit -> e
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
@@ -6474,9 +6497,9 @@
     1:1:boolean equals(java.lang.Object):8:8 -> equals
     1:1:int com.android.tools.r8.code.Format10x.hashCode():30:30 -> hashCode
     1:1:int hashCode():36 -> hashCode
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NotInt -> com.android.tools.r8.code.G2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6486,9 +6509,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.NotLong -> com.android.tools.r8.code.H2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6498,9 +6521,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrInt -> com.android.tools.r8.code.J2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -6509,9 +6532,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrInt2Addr -> com.android.tools.r8.code.I2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6521,23 +6544,23 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrIntLit16 -> com.android.tools.r8.code.K2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrIntLit8 -> com.android.tools.r8.code.L2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrLong -> com.android.tools.r8.code.N2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -6546,9 +6569,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.OrLong2Addr -> com.android.tools.r8.code.M2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6558,9 +6581,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.PackedSwitch -> com.android.tools.r8.code.O2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int):21:21 -> <init>
@@ -6569,10 +6592,10 @@
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):48:49 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isIntSwitch() -> v
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isIntSwitch() -> w
 com.android.tools.r8.code.PackedSwitchPayload -> com.android.tools.r8.code.P2:
     int[] targets -> h
     boolean $assertionsDisabled -> i
@@ -6581,17 +6604,18 @@
     1:1:void <clinit>():12:12 -> <clinit>
     1:6:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:24 -> <init>
     7:11:void <init>(int,int[]):28:32 -> <init>
-    1:1:int numberOfKeys():75:75 -> A
-    1:1:int[] switchTargetOffsets():80:80 -> B
+    1:1:int[] keys():85:85 -> B
+    1:1:int numberOfKeys():75:75 -> C
+    1:1:int[] switchTargetOffsets():80:80 -> D
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):42:43 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):97:97 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):43 -> a
     4:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):44:46 -> a
     7:16:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):95:104 -> a
-    17:17:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):195:195 -> a
+    17:17:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):203:203 -> a
     17:17:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):104 -> a
     18:18:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):106:106 -> a
-    19:19:java.lang.String com.android.tools.r8.code.Instruction.formatDecimalOffset(int):199:199 -> a
+    19:19:java.lang.String com.android.tools.r8.code.Instruction.formatDecimalOffset(int):207:207 -> a
     19:19:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):106 -> a
     20:22:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):108:110 -> a
     23:23:java.lang.String com.android.tools.r8.code.Format10x.toString(com.android.tools.r8.naming.ClassNameMapper):40:40 -> a
@@ -6602,9 +6626,8 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):90:90 -> b
     1:5:boolean equals(java.lang.Object):52:56 -> equals
     1:4:int hashCode():61:64 -> hashCode
-    1:1:int getSize():70:70 -> m
-    boolean isPayload() -> w
-    1:1:int[] keys():85:85 -> z
+    1:1:int getSize():70:70 -> n
+    boolean isPayload() -> y
 com.android.tools.r8.code.RemDouble -> com.android.tools.r8.code.R2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6613,9 +6636,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemDouble2Addr -> com.android.tools.r8.code.Q2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6625,9 +6648,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemFloat -> com.android.tools.r8.code.T2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -6636,9 +6659,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemFloat2Addr -> com.android.tools.r8.code.S2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6648,9 +6671,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemInt -> com.android.tools.r8.code.V2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6659,10 +6682,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemInt2Addr -> com.android.tools.r8.code.U2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6672,26 +6695,26 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemIntLit16 -> com.android.tools.r8.code.W2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemIntLit8 -> com.android.tools.r8.code.X2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemLong -> com.android.tools.r8.code.Z2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6700,10 +6723,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RemLong2Addr -> com.android.tools.r8.code.Y2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6713,10 +6736,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Return -> com.android.tools.r8.code.a3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6726,10 +6749,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():39:39 -> o
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.ReturnObject -> com.android.tools.r8.code.b3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6739,10 +6762,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():39:39 -> o
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.ReturnVoid -> com.android.tools.r8.code.c3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>():18:18 -> <init>
@@ -6757,10 +6780,10 @@
     1:1:boolean equals(java.lang.Object):8:8 -> equals
     1:1:int com.android.tools.r8.code.Format10x.hashCode():30:30 -> hashCode
     1:1:int hashCode():8 -> hashCode
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():37:37 -> o
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():37:37 -> p
 com.android.tools.r8.code.ReturnWide -> com.android.tools.r8.code.d3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -6770,24 +6793,24 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    1:1:int[] getTargets():39:39 -> o
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    1:1:int[] getTargets():39:39 -> p
 com.android.tools.r8.code.RsubInt -> com.android.tools.r8.code.e3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.RsubIntLit8 -> com.android.tools.r8.code.f3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.Sget -> com.android.tools.r8.code.g3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6799,11 +6822,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetBoolean -> com.android.tools.r8.code.h3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6815,11 +6838,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetByte -> com.android.tools.r8.code.i3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6831,11 +6854,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetChar -> com.android.tools.r8.code.j3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6847,11 +6870,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetObject -> com.android.tools.r8.code.k3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6863,11 +6886,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetShort -> com.android.tools.r8.code.l3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6879,11 +6902,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SgetWide -> com.android.tools.r8.code.m3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -6895,11 +6918,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShlInt -> com.android.tools.r8.code.o3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6908,9 +6931,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShlInt2Addr -> com.android.tools.r8.code.n3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6920,16 +6943,16 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShlIntLit8 -> com.android.tools.r8.code.p3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShlLong -> com.android.tools.r8.code.r3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6938,9 +6961,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShlLong2Addr -> com.android.tools.r8.code.q3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6950,9 +6973,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShrInt -> com.android.tools.r8.code.t3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6961,9 +6984,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShrInt2Addr -> com.android.tools.r8.code.s3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6973,16 +6996,16 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShrIntLit8 -> com.android.tools.r8.code.u3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShrLong -> com.android.tools.r8.code.w3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -6991,9 +7014,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.ShrLong2Addr -> com.android.tools.r8.code.v3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7003,9 +7026,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SparseSwitch -> com.android.tools.r8.code.x3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
@@ -7014,10 +7037,10 @@
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:48 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
-    boolean isIntSwitch() -> v
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+    boolean isIntSwitch() -> w
 com.android.tools.r8.code.SparseSwitchPayload -> com.android.tools.r8.code.y3:
     int[] keys -> g
     int[] targets -> h
@@ -7026,8 +7049,9 @@
     1:1:void <clinit>():12:12 -> <clinit>
     1:10:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:28 -> <init>
     11:15:void <init>(int[],int[]):32:36 -> <init>
-    1:1:int numberOfKeys():82:82 -> A
-    1:1:int[] switchTargetOffsets():92:92 -> B
+    1:1:int[] keys():87:87 -> B
+    1:1:int numberOfKeys():82:82 -> C
+    1:1:int[] switchTargetOffsets():92:92 -> D
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):46:47 -> a
     3:3:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):97:97 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):47 -> a
@@ -7041,9 +7065,8 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):97:97 -> b
     1:6:boolean equals(java.lang.Object):58:63 -> equals
     1:4:int hashCode():68:71 -> hashCode
-    1:1:int getSize():77:77 -> m
-    boolean isPayload() -> w
-    1:1:int[] keys():87:87 -> z
+    1:1:int getSize():77:77 -> n
+    boolean isPayload() -> y
 com.android.tools.r8.code.Sput -> com.android.tools.r8.code.z3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7055,11 +7078,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputBoolean -> com.android.tools.r8.code.A3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7071,11 +7094,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputByte -> com.android.tools.r8.code.B3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7087,11 +7110,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputChar -> com.android.tools.r8.code.C3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7103,11 +7126,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputObject -> com.android.tools.r8.code.D3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7119,11 +7142,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputShort -> com.android.tools.r8.code.E3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7135,11 +7158,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SputWide -> com.android.tools.r8.code.F3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
@@ -7151,11 +7174,11 @@
     6:6:void com.android.tools.r8.code.Format21c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):11:11 -> b
-    boolean canThrow() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> g
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    1:1:com.android.tools.r8.graph.DexField getField():47:47 -> h
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubDouble -> com.android.tools.r8.code.H3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7164,9 +7187,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubDouble2Addr -> com.android.tools.r8.code.G3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7176,9 +7199,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubFloat -> com.android.tools.r8.code.J3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7187,9 +7210,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubFloat2Addr -> com.android.tools.r8.code.I3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7199,9 +7222,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubInt -> com.android.tools.r8.code.L3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7210,9 +7233,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubInt2Addr -> com.android.tools.r8.code.K3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7222,9 +7245,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubLong -> com.android.tools.r8.code.N3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7233,9 +7256,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SubLong2Addr -> com.android.tools.r8.code.M3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7245,17 +7268,17 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.SwitchPayload -> com.android.tools.r8.code.O3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-    int numberOfKeys() -> A
-    int[] switchTargetOffsets() -> B
+    boolean isSwitchPayload() -> A
+    int[] keys() -> B
+    int numberOfKeys() -> C
+    int[] switchTargetOffsets() -> D
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
-    boolean isSwitchPayload() -> y
-    int[] keys() -> z
 com.android.tools.r8.code.Throw -> com.android.tools.r8.code.P3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
@@ -7265,10 +7288,10 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    boolean canThrow() -> f
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    boolean canThrow() -> g
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.UshrInt -> com.android.tools.r8.code.R3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7277,9 +7300,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.UshrInt2Addr -> com.android.tools.r8.code.Q3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7289,16 +7312,16 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.UshrIntLit8 -> com.android.tools.r8.code.S3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.UshrLong -> com.android.tools.r8.code.U3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
@@ -7307,9 +7330,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8:8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.UshrLong2Addr -> com.android.tools.r8.code.T3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7319,9 +7342,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorInt -> com.android.tools.r8.code.W3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7330,9 +7353,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorInt2Addr -> com.android.tools.r8.code.V3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7342,23 +7365,23 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8:8 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorIntLit16 -> com.android.tools.r8.code.X3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorIntLit8 -> com.android.tools.r8.code.Y3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorLong -> com.android.tools.r8.code.a4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -7367,9 +7390,9 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9:9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    java.lang.String getName() -> i
-    int getOpcode() -> k
-    java.lang.String getSmaliName() -> n
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
 com.android.tools.r8.code.XorLong2Addr -> com.android.tools.r8.code.Z3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7379,23 +7402,30 @@
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):9 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):9:9 -> b
-    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.r.a.a.a.a:
+    java.lang.String getName() -> j
+    int getOpcode() -> l
+    java.lang.String getSmaliName() -> o
+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 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.r.a.a.a.b:
+com.android.tools.r8.com.google.common.base.Ascii -> com.android.tools.r8.q.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
-    21:21: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):60:60 -> a
-    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.r.a.a.a.o:
+    1:9: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):46:54 -> a
+    10:25: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):51:66 -> a
+    26:26: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):64:64 -> a
+    27:49: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):57:79 -> a
+    50:50: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):76:76 -> a
+    51:77: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):72:98 -> a
+    78:78: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):96:96 -> a
+    79:104: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
+    105:123: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
+    124:124: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
+    125:125: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):60:60 -> a
+    126:129: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
+    130:130:boolean com.android.tools.r8.com.google.common.base.Objects.equal(java.lang.Object,java.lang.Object):52:52 -> a
+    131:141: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:
     int $r8$clinit -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
@@ -7421,7 +7451,7 @@
     2:2:boolean apply(java.lang.Object):53 -> apply
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.r.a.a.a.c:
+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 INSTANCE -> c
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -7431,27 +7461,27 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1209 -> negate
     1:1:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.r.a.a.a.d:
+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 INSTANCE -> c
     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.r.a.a.a.e:
+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 INSTANCE -> e
     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.r.a.a.a.f:
+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 INSTANCE -> e
     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.r.a.a.a.g:
+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 INSTANCE -> c
     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.r.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.q.a.a.a.h:
     java.lang.String description -> b
     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>
@@ -7466,7 +7496,7 @@
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1047:1047 -> negate
     1:1:java.util.function.Predicate 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.r.a.a.a.i:
+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 original -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7477,9 +7507,9 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     1:1: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.r.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.q.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.r.a.a.a.k:
+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 INSTANCE -> c
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7489,7 +7519,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     1:1:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.r.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.q.a.a.a.l:
     char[] rangeStarts -> c
     char[] rangeEnds -> d
     java.lang.String description -> b
@@ -7501,24 +7531,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.r.a.a.a.m:
+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 INSTANCE -> e
     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.r.a.a.a.n:
+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 INSTANCE -> d
     int SHIFT -> c
     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.r.a.a.a.p:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.q.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.r.a.a.a.q:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.q.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.r.a.a.a.v:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.q.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
@@ -7529,14 +7559,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.r.a.a.a.r:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.r.a.a.a.s:
+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$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.r.a.a.a.t:
+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 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>
@@ -7546,12 +7576,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.r.a.a.a.u:
+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 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.r.a.a.a.v$a:
+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 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>
@@ -7560,8 +7590,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.r.a.a.a.w:
-com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.r.a.a.a.x:
+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 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>
@@ -7572,19 +7602,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.r.a.a.a.z:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.q.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.r.a.a.a.y:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.q.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.r.a.a.a.D:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.q.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
@@ -7640,8 +7670,8 @@
     7:7:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     8:8:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     8:8: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.r.a.a.a.A:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.r.a.a.a.C:
+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$ToStringHelper$ValueHolder holderTail -> c
     com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder holderHead -> b
     java.lang.String className -> a
@@ -7655,17 +7685,16 @@
     3:4:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper add(java.lang.String,java.lang.Object):168 -> a
     1:18:java.lang.String toString():333:350 -> toString
     19:37:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.r.a.a.a.B:
+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 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.r.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.q.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 absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.r.a.a.a.F:
+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.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
@@ -7677,7 +7706,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.r.a.a.a.I:
+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.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -7692,21 +7721,21 @@
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):0:98 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.r.a.a.a.G:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.r.a.a.a.H:
+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:
     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.r.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.q.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.r.a.a.a.K:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.r.a.a.a.L:
+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.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.r.a.a.a.Q:
+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 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
@@ -7714,15 +7743,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.r.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.q.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.r.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.q.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.r.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.q.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.r.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.q.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.r.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.q.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>
@@ -7733,7 +7762,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.r.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.q.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
@@ -7750,24 +7779,24 @@
     11:11:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.r.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.q.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.r.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.r.a.a.a.W:
+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 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.r.a.a.a.X:
+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.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.r.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.q.a.a.a.Y:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
@@ -7789,7 +7818,7 @@
     12:12:void <clinit>():460 -> <clinit>
     13:13:java.lang.Object getJLA():486:486 -> <clinit>
     13:13:void <clinit>():452 -> <clinit>
-com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.r.a.a.b.a:
+com.android.tools.r8.com.google.common.collect.AbstractIndexedListIterator -> com.android.tools.r8.q.a.a.b.a:
     int position -> b
     int size -> a
     1:1:void <init>(int):52:52 -> <init>
@@ -7803,7 +7832,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.r.a.a.b.b:
+com.android.tools.r8.com.google.common.collect.AbstractIterator -> com.android.tools.r8.q.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>
@@ -7815,14 +7844,23 @@
     1:1:java.lang.Object endOfData():125:125 -> l
     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.AbstractListMultimap -> com.android.tools.r8.r.a.a.b.c:
+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[] $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
+    com.android.tools.r8.com.google.common.collect.AbstractIterator$State FAILED -> d
+    com.android.tools.r8.com.google.common.collect.AbstractIterator$State READY -> a
+    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:
     1:1:void <init>(java.util.Map):45:45 -> <init>
     1:1:java.util.List get(java.lang.Object):67:67 -> a
     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
     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.r.a.a.b.e:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap -> com.android.tools.r8.q.a.a.b.f:
     int totalSize -> f
     java.util.Map map -> e
     1:3:void <init>(java.util.Map):122:124 -> <init>
@@ -7869,9 +7907,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.r.a.a.b.d:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$2 -> com.android.tools.r8.q.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.r.a.a.b.e$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$AsMap -> com.android.tools.r8.q.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>
@@ -7899,7 +7937,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.r.a.a.b.e$a$a:
+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 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 -> c
@@ -7912,7 +7950,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.r.a.a.b.e$a$b:
+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 this$1 -> c
     java.util.Collection collection -> b
     java.util.Iterator delegateIterator -> a
@@ -7921,7 +7959,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.r.a.a.b.e$b:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$Itr -> com.android.tools.r8.q.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
@@ -7935,7 +7973,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.r.a.a.b.e$c:
+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 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
@@ -7964,7 +8002,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.r.a.a.b.f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$KeySet$1 -> com.android.tools.r8.q.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
@@ -7975,7 +8013,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():966 -> remove
     3:6:void remove():967:970 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap -> com.android.tools.r8.r.a.a.b.e$d:
+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 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
@@ -7990,26 +8028,26 @@
     1:2:java.util.Map$Entry firstEntry():1555:1556 -> firstEntry
     1:2:java.util.Map$Entry floorEntry(java.lang.Object):1522:1523 -> floorEntry
     1:1:java.lang.Object floorKey(java.lang.Object):1528:1528 -> floorKey
-    1:1:java.util.NavigableSet createKeySet():1598:1598 -> h
-    1:1:java.util.SortedSet createKeySet():1498 -> h
     1:1:java.util.NavigableMap headMap(java.lang.Object,boolean):1629:1629 -> headMap
     2:2:java.util.NavigableMap headMap(java.lang.Object,boolean):1629:1629 -> headMap
     2:2:java.util.NavigableMap headMap(java.lang.Object):1624 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):1498 -> headMap
     1:2:java.util.Map$Entry higherEntry(java.lang.Object):1544:1545 -> higherEntry
     1:1:java.lang.Object higherKey(java.lang.Object):1550:1550 -> higherKey
-    1:1:java.util.SortedSet keySet():1498:1498 -> i
-    1:1:java.util.SortedMap sortedMap():1498:1498 -> j
-    1:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.keySet():1488:1489 -> k
-    1:2:java.util.NavigableSet keySet():1593 -> k
-    3:3:java.util.NavigableSet keySet():1593:1593 -> k
+    1:1:java.util.NavigableSet createKeySet():1598:1598 -> i
+    1:1:java.util.SortedSet createKeySet():1498 -> i
+    1:1:java.util.SortedSet keySet():1498:1498 -> j
+    1:1:java.util.SortedMap sortedMap():1498:1498 -> k
     1:1:java.util.Set keySet():1498:1498 -> keySet
-    1:1:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.sortedMap():1449:1449 -> l
-    1:1:java.util.NavigableMap sortedMap():1506 -> l
-    2:2:java.util.NavigableMap sortedMap():1506:1506 -> l
+    1:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.keySet():1488:1489 -> l
+    1:2:java.util.NavigableSet keySet():1593 -> l
+    3:3:java.util.NavigableSet keySet():1593:1593 -> l
     1:2:java.util.Map$Entry lastEntry():1561:1562 -> lastEntry
     1:2:java.util.Map$Entry lowerEntry(java.lang.Object):1511:1512 -> lowerEntry
     1:1:java.lang.Object lowerKey(java.lang.Object):1517:1517 -> lowerKey
+    1:1:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.sortedMap():1449:1449 -> m
+    1:1:java.util.NavigableMap sortedMap():1506 -> m
+    2:2:java.util.NavigableMap sortedMap():1506:1506 -> m
     1:1:java.util.NavigableSet navigableKeySet():1603:1603 -> navigableKeySet
     1:1:java.util.Map$Entry pollFirstEntry():1567:1567 -> pollFirstEntry
     1:1:java.util.Map$Entry pollLastEntry():1572:1572 -> pollLastEntry
@@ -8021,7 +8059,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.r.a.a.b.e$e:
+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 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 -> c
@@ -8053,23 +8091,23 @@
     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.r.a.a.b.e$f:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$RandomAccessWrappedList -> com.android.tools.r8.q.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.r.a.a.b.e$g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap -> com.android.tools.r8.q.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>
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
-    1:1:java.util.SortedSet createKeySet():1494:1494 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):1469:1469 -> headMap
-    1:2:java.util.SortedSet keySet():1488:1489 -> i
-    1:1:java.util.SortedMap sortedMap():1449:1449 -> j
+    1:1:java.util.SortedSet createKeySet():1494:1494 -> i
+    1:2:java.util.SortedSet keySet():1488:1489 -> j
+    1:1:java.util.SortedMap sortedMap():1449:1449 -> k
     1:1:java.util.Set keySet():1442:1442 -> keySet
     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.r.a.a.b.e$h:
+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 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 -> c
@@ -8081,7 +8119,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.r.a.a.b.e$i:
+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 ancestor -> c
     java.util.Collection ancestorDelegate -> d
     java.util.Collection delegate -> b
@@ -8111,7 +8149,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.r.a.a.b.e$i$a:
+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 this$1 -> c
     java.util.Collection originalDelegate -> b
     java.util.Iterator delegateIterator -> a
@@ -8123,7 +8161,7 @@
     1:3:void validateIterator():481:483 -> k
     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.r.a.a.b.e$j:
+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 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
@@ -8200,7 +8238,7 @@
     8:339: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):0:331 -> subList
     8:339: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:339:java.util.List subList(int,int):864 -> subList
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$WrappedList$WrappedListIterator -> com.android.tools.r8.r.a.a.b.e$j$a:
+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 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>
@@ -8213,7 +8251,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.r.a.a.b.e$k:
+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 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
@@ -8243,11 +8281,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.r.a.a.b.e$l:
+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 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.r.a.a.b.e$m:
+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 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
@@ -8277,14 +8315,18 @@
     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.r.a.a.b.i:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset -> com.android.tools.r8.q.a.a.b.j:
     java.util.Map backingMap -> c
     long size -> d
     1:3:void <init>(java.util.Map):60:62 -> <init>
     1:1:java.util.Map access$000(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> a
     2:2:long access$102(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset,long):48:48 -> a
-    3:4:int count(java.lang.Object):208:209 -> a
-    5:24:int remove(java.lang.Object,int):247:266 -> a
+    3:3:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,java.lang.Object,com.android.tools.r8.com.google.common.collect.Count):131:131 -> a
+    4:5:int count(java.lang.Object):208:209 -> a
+    6:25:int remove(java.lang.Object,int):247:266 -> a
+    26:26:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    26:26:void forEachEntry(java.util.function.ObjIntConsumer):130 -> a
+    27:27:void forEachEntry(java.util.function.ObjIntConsumer):131:131 -> a
     1:1:long access$100(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> b
     2:16:int add(java.lang.Object,int):225:239 -> b
     1:1:long access$110(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):48:48 -> c
@@ -8300,7 +8342,7 @@
     1:2:java.util.Iterator entryIterator():86:87 -> e
     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.r.a.a.b.h:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1 -> com.android.tools.r8.q.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
@@ -8312,7 +8354,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():121 -> remove
     3:5:void remove():122:124 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.r.a.a.b.g:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$1$1 -> com.android.tools.r8.q.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>
@@ -8321,7 +8363,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.r.a.a.b.i$a:
+com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset$MapBasedMultisetIterator -> com.android.tools.r8.q.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
@@ -8335,13 +8377,13 @@
     2:2:void remove():193 -> remove
     3:11:void remove():194:202 -> remove
     12:12:void remove():196:196 -> remove
-com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.r.a.a.b.j:
+com.android.tools.r8.com.google.common.collect.AbstractMapEntry -> com.android.tools.r8.q.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.r.a.a.b.l:
+com.android.tools.r8.com.google.common.collect.AbstractMultimap -> com.android.tools.r8.q.a.a.b.m:
     java.util.Map asMap -> d
     java.util.Collection entries -> a
     java.util.Set keySet -> b
@@ -8364,14 +8406,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.r.a.a.b.k:
-com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries -> com.android.tools.r8.r.a.a.b.l$a:
+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 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.r.a.a.b.m:
+com.android.tools.r8.com.google.common.collect.AbstractMultiset -> com.android.tools.r8.q.a.a.b.n:
     java.util.Set elementSet -> a
     java.util.Set entrySet -> b
     1:1:void <init>():47:47 -> <init>
@@ -8411,16 +8453,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.r.a.a.b.m$a:
+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 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.r.a.a.b.m$b:
+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 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 -> c
     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.r.a.a.b.n:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.q.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>
@@ -8447,10 +8489,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.r.a.a.b.o:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.q.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() -> e
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.r.a.a.b.p:
+    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.q.a.a.b.q:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> b
     1:3:void <init>(com.android.tools.r8.com.google.common.base.Function,com.android.tools.r8.com.google.common.collect.Ordering):36:38 -> <init>
@@ -8460,7 +8502,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.r.a.a.b.q:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.q.a.a.b.r:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:void lambda$toImmutableMap$1(java.util.function.Function,java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Object):62:62 -> a
@@ -8470,7 +8512,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     4:4:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):59 -> a
     5:5:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.r.a.a.b.r:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.q.a.a.b.s:
     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>
@@ -8486,7 +8528,7 @@
     3:3:java.util.Spliterator trySplit():121 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> trySplit
     4:4:java.util.Spliterator trySplit():121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.r.a.a.b.s:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.q.a.a.b.t:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -8500,7 +8542,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.r.a.a.b.t:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.q.a.a.b.u:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -8516,7 +8558,7 @@
     3:3:java.util.Spliterator trySplit():167 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.r.a.a.b.u:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.q.a.a.b.v:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -8527,7 +8569,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.r.a.a.b.v:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.q.a.a.b.w:
     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
@@ -8722,14 +8764,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.r.a.a.b.w:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.q.a.a.b.x:
     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.r.a.a.b.x:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.q.a.a.b.y:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -8740,11 +8782,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.r.a.a.b.y:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.q.a.a.b.z:
     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.r.a.a.b.B:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.q.a.a.b.C:
     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
@@ -8755,25 +8797,28 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     2:2:com.android.tools.r8.com.google.common.collect.FluentIterable concatNoDefensiveCopy(java.lang.Iterable[]):259 -> b
     3:3:com.android.tools.r8.com.google.common.collect.FluentIterable concatNoDefensiveCopy(java.lang.Iterable[]):261:261 -> b
-    1:1:java.lang.Iterable getDelegate():127:127 -> toString
-    1:1:java.lang.String toString():336 -> toString
+    1:1:java.lang.Iterable getDelegate():127:127 -> c
+    2:52:java.lang.Object com.android.tools.r8.com.google.common.base.Absent.or(java.lang.Object):0:50 -> c
+    2:52:java.lang.Iterable getDelegate():127 -> c
+    53:53:java.lang.Iterable getDelegate():127:127 -> c
+    1:1:java.lang.String toString():336:336 -> toString
     2:2:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253:253 -> toString
     2:2:java.lang.String toString():336 -> toString
     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.r.a.a.b.A:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.q.a.a.b.B:
     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.r.a.a.b.z:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.q.a.a.b.A:
     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.r.a.a.b.C:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.q.a.a.b.D:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     1:1:boolean add(java.lang.Object):89:89 -> add
@@ -8793,7 +8838,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.r.a.a.b.D:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.q.a.a.b.E:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     1:1:java.util.Comparator comparator():69:69 -> comparator
@@ -8808,7 +8853,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.r.a.a.b.I:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.q.a.a.b.J:
     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
@@ -8851,9 +8896,9 @@
     1:6:void clear():380:385 -> clear
     1:1:boolean containsKey(java.lang.Object):245:245 -> containsKey
     1:1:boolean containsValue(java.lang.Object):250:250 -> containsValue
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():547:547 -> e
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySet():3666:3666 -> entrySet
     1:1:java.util.Set entrySet():57 -> entrySet
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():547:547 -> f
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):524 -> forEach
     2:5:void forEach(java.util.function.BiConsumer):525:528 -> forEach
@@ -8861,19 +8906,19 @@
     1:1:java.lang.Object get(java.lang.Object):256:256 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.valueOrNull(java.util.Map$Entry):3896:3896 -> get
     2:2:java.lang.Object get(java.lang.Object):256 -> get
-    1:1:java.util.Iterator entryIterator():474:474 -> h
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create(int):75:75 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> i
-    1:3:void rehashIfNecessary():341:343 -> j
-    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] createTable(int):361:361 -> j
-    4:4:void rehashIfNecessary():345 -> j
-    5:5:void rehashIfNecessary():345:345 -> j
-    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] createTable(int):361:361 -> j
-    6:6:void rehashIfNecessary():346 -> j
-    7:14:void rehashIfNecessary():346:353 -> j
-    15:18:void rehashIfNecessary():352:355 -> j
-    1:1:java.util.Set values():469:469 -> k
+    1:1:java.util.Iterator entryIterator():474:474 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create(int):75:75 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> j
+    1:3:void rehashIfNecessary():341:343 -> k
+    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] createTable(int):361:361 -> k
+    4:4:void rehashIfNecessary():345 -> k
+    5:5:void rehashIfNecessary():345:345 -> k
+    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] createTable(int):361:361 -> k
+    6:6:void rehashIfNecessary():346 -> k
+    7:14:void rehashIfNecessary():346:353 -> k
+    15:18:void rehashIfNecessary():352:355 -> k
     1:1:java.util.Set keySet():434:434 -> keySet
+    1:1:java.util.Set values():469:469 -> l
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):262:262 -> put
     1:8:java.lang.Object remove(java.lang.Object):367:374 -> remove
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> replaceAll
@@ -8885,19 +8930,19 @@
     1:1:int size():390:390 -> size
     1:1:java.util.Set values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.r.a.a.b.E:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.q.a.a.b.F:
     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.r.a.a.b.E$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.q.a.a.b.F$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.r.a.a.b.F:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.q.a.a.b.G:
     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
@@ -8905,7 +8950,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.r.a.a.b.I$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.q.a.a.b.J$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>
@@ -8917,13 +8962,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.BiMap forward():553:553 -> containsKey
     1:1:boolean containsKey(java.lang.Object):568 -> containsKey
     2:2:boolean containsKey(java.lang.Object):568:568 -> containsKey
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap forward():553:553 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():602 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap forward():553:553 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():602 -> f
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):692 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):693:693 -> forEach
     1:1:java.lang.Object get(java.lang.Object):573:573 -> get
-    1:1:java.util.Iterator entryIterator():645:645 -> h
+    1:1:java.util.Iterator entryIterator():645:645 -> i
     1:1:java.util.Set keySet():607:607 -> keySet
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):579:579 -> put
     1:8:java.lang.Object remove(java.lang.Object):589:596 -> remove
@@ -8943,27 +8988,27 @@
     1:1:java.util.Collection values():550 -> values
     2:2:java.util.Set values():640:640 -> values
     2:2:java.util.Collection values():550 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.r.a.a.b.G:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.q.a.a.b.H:
     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.r.a.a.b.G$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.q.a.a.b.H$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.r.a.a.b.I$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.q.a.a.b.J$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.r.a.a.b.H:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.q.a.a.b.I:
     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.r.a.a.b.I$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.q.a.a.b.J$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
@@ -8979,19 +9024,20 @@
     5:5:void remove():423 -> remove
     6:8:void remove():424:426 -> remove
     9:9:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.r.a.a.b.I$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.q.a.a.b.J$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.r.a.a.b.J:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.q.a.a.b.K:
     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.r.a.a.b.K:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.q.a.a.b.L:
     1:1:void <init>():70:70 -> <init>
     1:1:int count(java.lang.Object):33:33 -> a
-    2:2:int remove(java.lang.Object,int):33:33 -> a
-    3:3:boolean setCount(java.lang.Object,int,int):33:33 -> a
+    2:2:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
+    3:3:int remove(java.lang.Object,int):33:33 -> a
+    4:4:boolean setCount(java.lang.Object,int,int):33:33 -> a
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
     1:1:boolean addAll(java.util.Collection):33:33 -> addAll
@@ -9018,25 +9064,26 @@
     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.r.a.a.b.L:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.q.a.a.b.M:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     1:1:boolean isPartialView():56:56 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> i
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.r.a.a.b.M:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.q.a.a.b.N:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createValues():363:363 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():36 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> s
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():36 -> s
-    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> t
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of():66:66 -> u
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.inverse():41:41 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createValues():363:363 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():36 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> t
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():36 -> t
+    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> u
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of():66:66 -> v
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet values():358:358 -> values
     1:1:java.util.Collection values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.r.a.a.b.M$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.q.a.a.b.N$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
@@ -9062,9 +9109,9 @@
     482:482:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.r.a.a.b.N:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.q.a.a.b.O:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.r.a.a.b.Q:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.q.a.a.b.S:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -9082,6 +9129,7 @@
     1:1:void clear():297:297 -> clear
     boolean isPartialView() -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator() -> e
+    1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.ImmutableList.iterator():57:57 -> iterator
     1:1:boolean remove(java.lang.Object):234:234 -> remove
     1:1:boolean removeAll(java.util.Collection):260:260 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):273:273 -> removeIf
@@ -9095,7 +9143,7 @@
     10:15:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> toArray
     10:15:java.lang.Object[] toArray(java.lang.Object[]):200 -> toArray
     16:19:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.r.a.a.b.O:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.q.a.a.b.P:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -9111,19 +9159,19 @@
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):480 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):481:482 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.r.a.a.b.P:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.q.a.a.b.Q:
     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.r.a.a.b.S:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.q.a.a.b.T:
     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.r.a.a.b.T:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.q.a.a.b.U:
     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>
@@ -9141,24 +9189,24 @@
     1:4:boolean equals(java.lang.Object):86:89 -> equals
     1:1:void forEach(java.util.function.BiConsumer):103:103 -> forEach
     1:1:java.lang.Object get(java.lang.Object):78:78 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():457:457 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():0 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():479:479 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():0 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():457:457 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():0 -> k
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.keySet():445:445 -> keySet
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.keySet():0 -> keySet
-    boolean isPartialView() -> n
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> o
-    1:1:java.util.Spliterator keySpliterator():63:63 -> q
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():479:479 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():0 -> l
+    boolean isPartialView() -> o
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> p
+    1:1:java.util.Spliterator keySpliterator():63:63 -> r
     1:1:int size():68:68 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1462:1462 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> t
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> u
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1462:1462 -> u
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> u
     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.r.a.a.b.U:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.q.a.a.b.V:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -9177,11 +9225,10 @@
     boolean isHashCodeFast() -> h
     1:2:int hashCode():126:127 -> hashCode
     1:1:boolean isEmpty():102:102 -> isEmpty
-    1:1:java.util.Iterator iterator():33:33 -> iterator
     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.r.a.a.b.W:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.q.a.a.b.X:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList of(java.lang.Object,java.lang.Object):102:102 -> a
@@ -9294,7 +9341,6 @@
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfRandomAccess(java.util.List,java.lang.Object):1069:1078 -> indexOf
     1:10:int com.android.tools.r8.com.google.common.collect.Lists.indexOfImpl(java.util.List,java.lang.Object):1056 -> indexOf
     1:10:int indexOf(java.lang.Object):412 -> indexOf
-    1:1:java.util.Iterator iterator():57:57 -> iterator
     1:2:int com.android.tools.r8.com.google.common.collect.Lists.lastIndexOfRandomAccess(java.util.List,java.lang.Object):1111:1112 -> lastIndexOf
     1:2:int com.android.tools.r8.com.google.common.collect.Lists.lastIndexOfImpl(java.util.List,java.lang.Object):1091 -> lastIndexOf
     1:2:int lastIndexOf(java.lang.Object):417 -> lastIndexOf
@@ -9309,11 +9355,11 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():576 -> spliterator
     1:1:java.util.List subList(int,int):57:57 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.r.a.a.b.V:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.q.a.a.b.W:
     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.r.a.a.b.W$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.q.a.a.b.X$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
@@ -9323,7 +9369,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.r.a.a.b.X:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.q.a.a.b.Y:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean contains(java.lang.Object):623:623 -> contains
@@ -9356,7 +9402,7 @@
     2:2:java.util.ListIterator listIterator(int):601 -> listIterator
     1:1:int size():652:652 -> size
     1:1:java.util.List subList(int,int):601:601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.r.a.a.b.W$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.q.a.a.b.X$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -9373,14 +9419,14 @@
     2:2:java.util.ListIterator listIterator(int):457 -> listIterator
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.r.a.a.b.Z:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.q.a.a.b.a0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):405:405 -> get
     1:1:java.util.Collection get(java.lang.Object):52 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList get(java.lang.Object):406 -> get
     2:2:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.r.a.a.b.Y:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.q.a.a.b.Z:
     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
@@ -9416,7 +9462,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.r.a.a.b.b0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.q.a.a.b.c0:
     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
@@ -9468,32 +9514,32 @@
     1:3:boolean com.android.tools.r8.com.google.common.collect.Maps.equalsImpl(java.util.Map,java.lang.Object):3804:3806 -> equals
     1:3:boolean equals(java.lang.Object):835 -> equals
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):666:666 -> getOrDefault
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> h
-    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> h
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> h
     1:1:int hashCode():842:842 -> hashCode
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> i
+    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> i
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> i
     1:1:boolean isEmpty():647:647 -> isEmpty
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> j
-    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> k
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> j
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> k
     1:1:java.util.Set keySet():60:60 -> keySet
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():679:680 -> l
-    boolean isHashCodeFast() -> m
+    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> l
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():679:680 -> m
     1:1:java.lang.Object merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction):582:582 -> merge
-    boolean isPartialView() -> n
-    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():706:707 -> o
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():694:695 -> p
+    boolean isHashCodeFast() -> n
+    boolean isPartialView() -> o
+    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():706:707 -> p
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):495:495 -> put
     1:1:void putAll(java.util.Map):594:594 -> putAll
     1:1:java.lang.Object putIfAbsent(java.lang.Object,java.lang.Object):508:508 -> putIfAbsent
-    1:1:java.util.Spliterator keySpliterator():721:721 -> q
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> r
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():694:695 -> q
+    1:1:java.util.Spliterator keySpliterator():721:721 -> r
     1:1:java.lang.Object remove(java.lang.Object):618:618 -> remove
     2:2:boolean remove(java.lang.Object,java.lang.Object):630:630 -> remove
     1:1:boolean replace(java.lang.Object,java.lang.Object,java.lang.Object):520:520 -> replace
     2:2:java.lang.Object replace(java.lang.Object,java.lang.Object):532:532 -> replace
     1:1:void replaceAll(java.util.function.BiFunction):606:606 -> replaceAll
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> s
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> s
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> t
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3815 -> toString
     1:1:java.lang.String toString():851 -> toString
     2:3:java.lang.StringBuilder com.android.tools.r8.com.google.common.collect.Collections2.newStringBuilderForCollection(int):369:370 -> toString
@@ -9502,12 +9548,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3824 -> toString
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.r.a.a.b.a0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.q.a.a.b.b0:
     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.r.a.a.b.b0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.q.a.a.b.c0$a:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -9534,28 +9580,28 @@
     496:496:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     496:496:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):329 -> a
     497:499:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):330:332 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.r.a.a.b.c0:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.q.a.a.b.d0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> e
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> iterator
     1:1:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.r.a.a.b.f0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.q.a.a.b.g0:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.r.a.a.b.d0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.q.a.a.b.e0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.r.a.a.b.e0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.q.a.a.b.f0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.r.a.a.b.h0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.q.a.a.b.i0:
     1:1:void <init>():77:77 -> <init>
     1:4:boolean contains(java.lang.Object):88:91 -> contains
     1:1:boolean isPartialView():98:98 -> d
@@ -9563,7 +9609,7 @@
     1:1:int hashCode():109:109 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.r.a.a.b.g0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.q.a.a.b.h0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     java.util.Map$Entry[] entries -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -9578,7 +9624,7 @@
     1:1:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.r.a.a.b.i0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.q.a.a.b.j0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -9593,7 +9639,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.r.a.a.b.l0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.q.a.a.b.m0:
     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
@@ -9619,19 +9665,19 @@
     1:1:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.r.a.a.b.j0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.q.a.a.b.k0:
     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.r.a.a.b.k0:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.q.a.a.b.l0:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:java.lang.Object get(int):86:86 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.r.a.a.b.p0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.q.a.a.b.q0:
     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>
@@ -9673,13 +9719,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.r.a.a.b.m0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.q.a.a.b.n0:
     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.r.a.a.b.n0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.q.a.a.b.o0:
     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.r.a.a.b.o0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.q.a.a.b.p0:
     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:3:boolean contains(java.lang.Object):560:562 -> contains
@@ -9689,11 +9735,10 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():545:545 -> e
     2:597:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMultimap.entryIterator():0:595 -> e
     2:597:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():545 -> e
-    1:1:java.util.Iterator iterator():536:536 -> iterator
     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.r.a.a.b.p0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.q.a.a.b.q0$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -9706,7 +9751,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.r.a.a.b.p0$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.q.a.a.b.q0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     1:2:int count(java.lang.Object):650:651 -> a
@@ -9728,7 +9773,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.r.a.a.b.r0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.q.a.a.b.s0:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> c
@@ -9755,16 +9800,15 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():363 -> g
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():363:363 -> g
     1:1:int hashCode():345:345 -> hashCode
-    1:1:java.util.Iterator iterator():53:53 -> iterator
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.r.a.a.b.q0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.q.a.a.b.r0:
     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.r.a.a.b.r0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.q.a.a.b.s0$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -9774,9 +9818,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.r.a.a.b.s0:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.q.a.a.b.t0:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.r.a.a.b.t0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.q.a.a.b.u0:
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> b
     int $r8$clinit -> c
     1:1:void <init>():332:332 -> <init>
@@ -9810,7 +9854,7 @@
     1:1:int hashCode():354:354 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> i
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.r.a.a.b.t0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.q.a.a.b.u0$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
@@ -9819,24 +9863,23 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):490:490 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.r.a.a.b.v0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.q.a.a.b.w0:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():381:381 -> e
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.Consumer):391 -> forEach
     2:4:void forEach(java.util.function.Consumer):392:394 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> g
-    1:1:java.util.Iterator iterator():376:376 -> iterator
     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.r.a.a.b.u0:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.q.a.a.b.v0:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:java.lang.Object get(int):403:403 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed delegateCollection():408:408 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.r.a.a.b.w0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.q.a.a.b.x0:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet delegateCollection():39:39 -> comparator
     1:1:java.util.Comparator comparator():44 -> comparator
@@ -9856,7 +9899,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.r.a.a.b.A0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap -> com.android.tools.r8.q.a.a.b.B0:
     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
@@ -10020,15 +10063,14 @@
     5:5:java.util.Map$Entry higherEntry(java.lang.Object):877 -> higherEntry
     6:6:java.util.Map$Entry higherEntry(java.lang.Object):877:877 -> higherEntry
     1:1:java.lang.Object higherKey(java.lang.Object):882:882 -> higherKey
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672:672 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672 -> i
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672:672 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():685:685 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():699:699 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672:672 -> j
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> j
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672 -> j
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():672:672 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():685:685 -> k
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet keySet():680:680 -> keySet
     1:1:java.util.Set keySet():62 -> keySet
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():623:623 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():699:699 -> l
     1:1:java.util.Map$Entry lastEntry():892:892 -> lastEntry
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():623:623 -> lastEntry
     2:2:java.util.Map$Entry lastEntry():892 -> lastEntry
@@ -10048,18 +10090,19 @@
     3:3:java.util.Map$Entry lowerEntry(java.lang.Object):847 -> lowerEntry
     4:4:java.util.Map$Entry lowerEntry(java.lang.Object):847:847 -> lowerEntry
     1:1:java.lang.Object lowerKey(java.lang.Object):852:852 -> lowerKey
-    1:1:boolean isPartialView():614:614 -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():623:623 -> m
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet navigableKeySet():940:940 -> navigableKeySet
     1:1:java.util.NavigableSet navigableKeySet():62 -> navigableKeySet
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet keySet():680:680 -> p
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():62 -> p
+    1:1:boolean isPartialView():614:614 -> o
     1:1:java.util.Map$Entry pollFirstEntry():905:905 -> pollFirstEntry
     1:1:java.util.Map$Entry pollLastEntry():918:918 -> pollLastEntry
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> s
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet keySet():680:680 -> q
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():62 -> q
     1:1:int size():594:594 -> size
     1:1:java.util.NavigableMap subMap(java.lang.Object,boolean,java.lang.Object,boolean):62:62 -> subMap
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap subMap(java.lang.Object,java.lang.Object):781:781 -> subMap
     2:2:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):62 -> subMap
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> t
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap tailMap(java.lang.Object,boolean):842:842 -> tailMap
     1:1:java.util.NavigableMap tailMap(java.lang.Object,boolean):62 -> tailMap
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> tailMap
@@ -10091,13 +10134,13 @@
     10:10:java.util.SortedMap tailMap(java.lang.Object):62 -> tailMap
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():694:694 -> values
     1:1:java.util.Collection values():62 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.r.a.a.b.x0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1 -> com.android.tools.r8.q.a.a.b.y0:
     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.r.a.a.b.z0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet -> com.android.tools.r8.q.a.a.b.A0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap this$0 -> d
     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.UnmodifiableIterator iterator():632:632 -> e
@@ -10107,7 +10150,7 @@
     1:1:java.util.Iterator iterator():628 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():669:669 -> k
     1:1:java.util.Spliterator spliterator():637:637 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.r.a.a.b.y0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet$1 -> com.android.tools.r8.q.a.a.b.z0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$1EntrySet):647:647 -> <init>
     1:2:java.util.Map$Entry get(int):650:651 -> get
@@ -10119,7 +10162,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.r.a.a.b.A0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMap$Builder -> com.android.tools.r8.q.a.a.b.B0$a:
     java.util.Comparator comparator -> e
     1:2:void <init>(java.util.Comparator):475:476 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.putAll(java.util.Map):286:286 -> a
@@ -10140,9 +10183,9 @@
     2:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():564:570 -> b
     9:9:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():568:568 -> b
     10:10:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap build():566:566 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.r.a.a.b.B0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedMapFauxverideShim -> com.android.tools.r8.q.a.a.b.C0:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.r.a.a.b.C0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.q.a.a.b.D0:
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> e
     java.util.Comparator comparator -> d
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
@@ -10205,7 +10248,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSet(java.lang.Object,boolean):661:661 -> tailSet
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet 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.r.a.a.b.C0$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.q.a.a.b.D0$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
@@ -10229,9 +10272,9 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder addAll(java.lang.Iterable):509 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder add(java.lang.Object):479 -> d
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.r.a.a.b.D0:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.q.a.a.b.E0:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.r.a.a.b.E0:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.q.a.a.b.F0:
     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>
@@ -10257,35 +10300,35 @@
     3:3:java.util.Spliterator spliterator():594 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.r.a.a.b.F0:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.q.a.a.b.G0:
     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.r.a.a.b.G0:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.q.a.a.b.H0:
     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.r.a.a.b.H0:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.q.a.a.b.I0:
     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.r.a.a.b.I0:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.q.a.a.b.J0:
     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 -> k
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.r.a.a.b.J0:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.q.a.a.b.K0:
     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.r.a.a.b.K0:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.q.a.a.b.L0:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -10294,21 +10337,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.r.a.a.b.L0:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.q.a.a.b.M0:
     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.r.a.a.b.M0:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.q.a.a.b.N0:
     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.r.a.a.b.N0:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.q.a.a.b.O0:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10328,17 +10371,17 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():1433 -> remove
     3:4:void remove():1434:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.r.a.a.b.O0:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.q.a.a.b.P0:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     1:1:void remove():112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.r.a.a.b.P0:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.r.a.a.b.Q0:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.q.a.a.b.Q0:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.q.a.a.b.R0:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.r.a.a.b.S0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.q.a.a.b.T0:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:int size():906:906 -> a
@@ -10399,7 +10442,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.r.a.a.b.R0:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.q.a.a.b.S0:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -10422,7 +10465,7 @@
     2:2:void remove():975 -> remove
     3:4:void remove():976:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.r.a.a.b.T0:
+com.android.tools.r8.com.google.common.collect.MapMaker -> com.android.tools.r8.q.a.a.b.U0:
     boolean useCustomMap -> a
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength valueStrength -> b
     1:1:void <init>():108:108 -> <init>
@@ -10434,7 +10477,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 -> e
     2:6:com.android.tools.r8.com.google.common.collect.MapMaker weakValues():239 -> e
     1:17:java.lang.String toString():290:306 -> toString
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.r.a.a.b.Y0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap -> com.android.tools.r8.q.a.a.b.Z0:
     java.util.Set keySet -> g
     java.util.Set entrySet -> i
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper entryHelper -> f
@@ -10471,7 +10514,7 @@
     3:1459:java.lang.Object get(java.lang.Object):2375 -> get
     1460:1466:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment.get(java.lang.Object,int):1450:1456 -> get
     1460:1466:java.lang.Object get(java.lang.Object):2375 -> get
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence valueEquivalence():2322:2322 -> h
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence valueEquivalence():2322:2322 -> i
     1:14:boolean isEmpty():2337:2350 -> isEmpty
     1:2:java.util.Set keySet():2514:2515 -> keySet
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> put
@@ -10551,11 +10594,11 @@
     93:127:boolean replace(java.lang.Object,java.lang.Object,java.lang.Object):2491 -> 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.r.a.a.b.U0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$1 -> com.android.tools.r8.q.a.a.b.V0:
     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.r.a.a.b.V0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractStrongKeyEntry -> com.android.tools.r8.q.a.a.b.W0:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry next -> c
     java.lang.Object key -> a
     int hash -> b
@@ -10563,19 +10606,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.r.a.a.b.W0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$AbstractWeakKeyEntry -> com.android.tools.r8.q.a.a.b.X0:
     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.r.a.a.b.X0:
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.r.a.a.b.Y0$a:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$DummyInternalEntry -> com.android.tools.r8.q.a.a.b.Y0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntryIterator -> com.android.tools.r8.q.a.a.b.Z0$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.r.a.a.b.Y0$b:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$EntrySet -> com.android.tools.r8.q.a.a.b.Z0$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
@@ -10584,7 +10627,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.r.a.a.b.Y0$c:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$HashIterator -> com.android.tools.r8.q.a.a.b.Z0$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
@@ -10612,21 +10655,21 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry.getKey():2679:2679 -> remove
     4:4:void remove():2643 -> remove
     5:6:void remove():2643:2644 -> remove
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.r.a.a.b.Z0:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntry -> com.android.tools.r8.q.a.a.b.a1:
     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.r.a.a.b.a1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$InternalEntryHelper -> com.android.tools.r8.q.a.a.b.b1:
     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.r.a.a.b.Y0$d:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeyIterator -> com.android.tools.r8.q.a.a.b.Z0$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.r.a.a.b.Y0$e:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$KeySet -> com.android.tools.r8.q.a.a.b.Z0$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
@@ -10635,12 +10678,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.r.a.a.b.b1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$SafeToArraySet -> com.android.tools.r8.q.a.a.b.c1:
     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.r.a.a.b.c1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment -> com.android.tools.r8.q.a.a.b.d1:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap map -> a
     java.util.concurrent.atomic.AtomicInteger readCount -> g
     int $r8$clinit -> h
@@ -10723,27 +10766,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.r.a.a.b.f1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength -> com.android.tools.r8.q.a.a.b.g1:
     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.r.a.a.b.d1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$1 -> com.android.tools.r8.q.a.a.b.e1:
     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.r.a.a.b.e1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Strength$2 -> com.android.tools.r8.q.a.a.b.f1:
     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.r.a.a.b.h1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry -> com.android.tools.r8.q.a.a.b.i1:
     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.r.a.a.b.g1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueEntry$Helper -> com.android.tools.r8.q.a.a.b.h1:
     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>
@@ -10760,10 +10803,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.r.a.a.b.i1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyStrongValueSegment -> com.android.tools.r8.q.a.a.b.j1:
     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.r.a.a.b.k1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry -> com.android.tools.r8.q.a.a.b.l1:
     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>
@@ -10771,7 +10814,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.r.a.a.b.j1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueEntry$Helper -> com.android.tools.r8.q.a.a.b.k1:
     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>
@@ -10791,7 +10834,7 @@
     1977:1977: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
     1977:1977: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.r.a.a.b.l1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$StrongKeyWeakValueSegment -> com.android.tools.r8.q.a.a.b.m1:
     java.lang.ref.ReferenceQueue queueForValues -> i
     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>
@@ -10799,12 +10842,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.r.a.a.b.Y0$f:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.q.a.a.b.Z0$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.r.a.a.b.Y0$g:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Values -> com.android.tools.r8.q.a.a.b.Z0$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
@@ -10814,7 +10857,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.r.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.q.a.a.b.o1:
     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>
@@ -10826,7 +10869,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.r.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.q.a.a.b.n1:
     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>
@@ -10846,7 +10889,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.r.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.q.a.a.b.p1:
     java.lang.ref.ReferenceQueue queueForKeys -> i
     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>
@@ -10854,7 +10897,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.r.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.q.a.a.b.r1:
     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>
@@ -10865,7 +10908,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.r.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.q.a.a.b.q1:
     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>
@@ -10888,7 +10931,7 @@
     1978:1978: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
     1978:1978: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.r.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.q.a.a.b.s1:
     java.lang.ref.ReferenceQueue queueForValues -> j
     java.lang.ref.ReferenceQueue queueForKeys -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10898,17 +10941,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.r.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.q.a.a.b.t1:
     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.r.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.q.a.a.b.u1:
     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.r.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.q.a.a.b.v1:
     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.r.a.a.b.Y0$h:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WriteThroughEntry -> com.android.tools.r8.q.a.a.b.Z0$h:
     com.android.tools.r8.com.google.common.collect.MapMakerInternalMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Object key -> a
@@ -10929,13 +10972,13 @@
     5:6:java.lang.Object com.android.tools.r8.com.google.common.collect.MapMakerInternalMap.put(java.lang.Object,java.lang.Object):2442:2443 -> setValue
     5:6:java.lang.Object setValue(java.lang.Object):2705 -> setValue
     7:7:java.lang.Object setValue(java.lang.Object):2706:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.r.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.r.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.q.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.q.a.a.b.x1:
     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.r.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.q.a.a.b.y1:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -10948,23 +10991,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1447:1447 -> next
     3:3:java.util.Map$Entry 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.r.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.q.a.a.b.B1:
     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.r.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.q.a.a.b.z1:
     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.r.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.q.a.a.b.A1:
     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.r.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.q.a.a.b.C1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> c
     1:1:void clear():4122:4122 -> clear
@@ -10983,11 +11026,11 @@
     6:6:boolean retainAll(java.util.Collection):4166 -> retainAll
     7:13:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.r.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.q.a.a.b.E1:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-    java.util.Iterator entryIterator() -> h
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.r.a.a.b.C1:
+    java.util.Iterator entryIterator() -> i
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.q.a.a.b.D1:
     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 -> c
@@ -11000,7 +11043,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.r.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.q.a.a.b.F1:
     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
@@ -11035,7 +11078,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.r.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.q.a.a.b.G1:
     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
@@ -11091,7 +11134,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.r.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.q.a.a.b.H1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -11103,31 +11146,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.r.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.q.a.a.b.I1:
     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.r.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.q.a.a.b.J1:
     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.r.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.q.a.a.b.K1:
     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.r.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.q.a.a.b.L1:
     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.r.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.q.a.a.b.N1:
     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.r.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.q.a.a.b.M1:
     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>
@@ -11140,12 +11183,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.r.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.q.a.a.b.O1:
     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.r.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.q.a.a.b.P1:
     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
@@ -11163,7 +11206,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.r.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.q.a.a.b.S1:
     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
@@ -11185,17 +11228,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.r.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.q.a.a.b.R1:
     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.r.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.q.a.a.b.Q1:
     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.r.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.q.a.a.b.S1$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 -> c
@@ -11208,11 +11251,15 @@
     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.r.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.q.a.a.b.T1:
     int count(java.lang.Object) -> a
     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
+    1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):321:321 -> a
+    2:5:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):494:497 -> a
+    6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    6:6:void forEachEntry(java.util.function.ObjIntConsumer):320 -> a
+    7:7:void forEachEntry(java.util.function.ObjIntConsumer):321:321 -> a
     int add(java.lang.Object,int) -> b
     java.util.Set elementSet() -> b
     int setCount(java.lang.Object,int) -> c
@@ -11220,22 +11267,22 @@
     1:1:void forEach(java.util.function.Consumer):490 -> forEach
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.r.a.a.b.S1$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.q.a.a.b.T1$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.r.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.q.a.a.b.U1:
     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.r.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.q.a.a.b.V1:
     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.r.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.q.a.a.b.X1:
     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
@@ -11265,25 +11312,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.r.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.q.a.a.b.W1:
     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.r.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.q.a.a.b.Y1:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> c
     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.r.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.q.a.a.b.Z1:
     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.r.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.q.a.a.b.a2:
     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>
@@ -11297,12 +11344,12 @@
     3:3:int compare(java.lang.Object,java.lang.Object):25 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):37:37 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.r.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.q.a.a.b.b2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.r.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.q.a.a.b.c2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11314,7 +11361,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList delegateList():50:50 -> j
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     1:1:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.r.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.q.a.a.b.f2:
     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
@@ -11355,32 +11402,31 @@
     1:1:int access$200(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> b
     1:1:int access$300(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> c
     1:1:java.util.Map$Entry[] access$400(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):43:43 -> d
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():41:41 -> e
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):156 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):157:158 -> forEach
     1:1:java.lang.Object get(java.lang.Object):139:139 -> get
     1:1:int hashCode():169:169 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:144 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> i
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():151:151 -> j
-    boolean isHashCodeFast() -> m
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:144 -> j
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> j
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> j
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():151:151 -> k
+    boolean isHashCodeFast() -> n
+    boolean isPartialView() -> o
     1:1:int size():179:179 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:188 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> t
-    3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.r.a.a.b.c2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.r.a.a.b.e2$a:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:188 -> u
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> u
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> u
+    3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> u
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.q.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.q.a.a.b.f2$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>
     1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):210:210 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> e
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> f
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):209 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):210:210 -> forEach
@@ -11391,14 +11437,14 @@
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():39:39 -> get
     8:8:java.lang.Object get(java.lang.Object):223 -> get
     9:9:java.lang.Object get(java.lang.Object):221:221 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():231:231 -> j
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():231:231 -> k
+    boolean isPartialView() -> o
     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
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.r.a.a.b.e2$a$a:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> u
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.q.a.a.b.f2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> e
@@ -11409,7 +11455,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     1:1:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.r.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.q.a.a.b.e2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
@@ -11418,7 +11464,7 @@
     3:3:java.util.Map$Entry get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> i
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.r.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.q.a.a.b.g2:
     java.lang.Object[] array -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> d
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11431,7 +11477,7 @@
     1:1:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.r.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.q.a.a.b.j2:
     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
@@ -11465,12 +11511,12 @@
     1:1:void forEach(java.util.function.BiConsumer):151 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):152:153 -> forEach
     1:1:java.lang.Object get(java.lang.Object):122:122 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():174:174 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():174:174 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> l
+    boolean isPartialView() -> o
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.r.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.q.a.a.b.h2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     1:1:boolean contains(java.lang.Object):192:192 -> contains
@@ -11479,13 +11525,13 @@
     boolean isPartialView() -> d
     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.r.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.q.a.a.b.i2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> d
     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.r.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.q.a.a.b.l2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> e
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> f
@@ -11507,8 +11553,8 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> g
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.r.a.a.b.j2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.r.a.a.b.k2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.q.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.q.a.a.b.l2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11518,11 +11564,11 @@
     boolean isPartialView() -> d
     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.r.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.q.a.a.b.m2:
     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.r.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.q.a.a.b.n2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> h
     java.lang.Object[] elements -> d
     java.lang.Object[] table -> e
@@ -11546,7 +11592,7 @@
     1:1:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.r.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.q.a.a.b.o2:
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> f
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> g
     1:1:void <clinit>():44:44 -> <clinit>
@@ -11661,7 +11707,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.r.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.q.a.a.b.p2:
     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>
@@ -11672,7 +11718,7 @@
     2:2:int compare(java.lang.Object,java.lang.Object):26 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):38:38 -> 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.r.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.q.a.a.b.q2:
     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 -> b
@@ -11680,7 +11726,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.r.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.q.a.a.b.s2:
     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>
@@ -11692,13 +11738,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.r.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.q.a.a.b.r2:
     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 -> k
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.r.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.q.a.a.b.u2:
     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>
@@ -11710,12 +11756,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.r.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.q.a.a.b.t2:
     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 -> k
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.r.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.q.a.a.b.w2:
     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>
@@ -11728,12 +11774,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.r.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.q.a.a.b.v2:
     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 -> k
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.r.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.q.a.a.b.A2:
     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>
@@ -11741,31 +11787,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.r.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.q.a.a.b.z2:
     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 -> k
     1:29:java.lang.Object computeNext():1688 -> k
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.r.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.q.a.a.b.y2:
     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.r.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.q.a.a.b.x2:
     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 -> k
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.r.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.q.a.a.b.B2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     1:1:boolean retainAll(java.util.Collection):85 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85:85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.r.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.q.a.a.b.C2:
     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
@@ -11775,7 +11821,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.r.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.q.a.a.b.D2:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11802,7 +11848,7 @@
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
     1:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.r.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.q.a.a.b.E2:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11810,23 +11856,23 @@
     5:8:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableBiMap):47:50 -> <init>
     1:1:boolean containsKey(java.lang.Object):70:70 -> containsKey
     1:1:boolean containsValue(java.lang.Object):75:75 -> containsValue
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> e
-    1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> e
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> f
+    1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> f
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):65 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):65:65 -> forEach
     1:1:java.lang.Object get(java.lang.Object):55:55 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> i
-    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> i
-    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> i
-    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> j
-    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> j
-    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> j
-    boolean isPartialView() -> n
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> t
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.r.a.a.b.E2:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> j
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> j
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> j
+    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> j
+    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> k
+    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> k
+    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> k
+    boolean isPartialView() -> o
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> u
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.q.a.a.b.F2:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> d
@@ -11841,7 +11887,7 @@
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:java.util.List subList(int,int):31:31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.r.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.q.a.a.b.G2:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11857,24 +11903,23 @@
     2:95:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():71 -> g
     1:1:boolean isHashCodeFast():97:97 -> h
     1:3:int hashCode():88:90 -> hashCode
-    1:1:java.util.Iterator iterator():29:29 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.r.a.a.b.G2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.r.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.q.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.q.a.a.b.I2:
     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.r.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.q.a.a.b.J2:
     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.r.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.q.a.a.b.K2:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.r.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.q.a.a.b.L2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11888,29 +11933,29 @@
     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.r.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.q.a.a.b.M2:
     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.r.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.q.a.a.b.N2:
     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.r.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.q.a.a.b.O2:
     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.r.a.a.c.a:
+com.android.tools.r8.com.google.common.hash.AbstractHashFunction -> com.android.tools.r8.q.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
-com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.r.a.a.c.b:
+com.android.tools.r8.com.google.common.hash.AbstractHasher -> com.android.tools.r8.q.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.r.a.a.c.e:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.q.a.a.c.e:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -11923,7 +11968,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.r.a.a.c.c:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.q.a.a.c.c:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -11931,29 +11976,29 @@
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.r.a.a.c.d:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.q.a.a.c.d:
     int hash -> c
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.r.a.a.c.f:
+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.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.r.a.a.c.g:
+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.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.r.a.a.c.i:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.q.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.r.a.a.c.h:
+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.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.r.a.a.c.l:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.q.a.a.c.l:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -11968,8 +12013,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.r.a.a.c.j:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.r.a.a.c.k:
+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:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -12001,7 +12046,7 @@
     4:4:void checkNotDone():149:149 -> b
     4:4:void update(byte[],int,int):138 -> b
     5:5:void update(byte[],int,int):139:139 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.r.a.a.c.n:
+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.HashFunction MURMUR3_32 -> a
     1:3:void <clinit>():53:55 -> <clinit>
     1:1:void <init>(int):65:65 -> <init>
@@ -12032,7 +12077,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.r.a.a.c.m:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.q.a.a.c.m:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -12052,7 +12097,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.r.a.a.d.e:
+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 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>
@@ -12075,7 +12120,7 @@
     12:12:java.lang.String encode(byte[]):144 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():355:355 -> a
     com.android.tools.r8.com.google.common.io.BaseEncoding omitPadding() -> b
-com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.r.a.a.d.a:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.q.a.a.d.a:
     char[] chars -> c
     int charsPerChunk -> f
     byte[] decodabet -> h
@@ -12092,19 +12137,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.r.a.a.d.b:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.q.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.r.a.a.d.c:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.q.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.r.a.a.d.d:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.q.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>
@@ -12119,7 +12164,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.r.a.a.d.g:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.q.a.a.d.g:
     java.io.OutputStream NULL_OUTPUT_STREAM -> a
     1:1:void <clinit>():594:594 -> <clinit>
     1:3:byte[] toByteArray(java.io.InputStream):165:167 -> a
@@ -12129,13 +12174,13 @@
     6:6:byte[] createBuffer():56:56 -> a
     6:6:long copy(java.io.InputStream,java.io.OutputStream):103 -> a
     7:11:long copy(java.io.InputStream,java.io.OutputStream):106:110 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.r.a.a.d.f:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.q.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.r.a.a.d.h:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.q.a.a.d.h:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -12153,11 +12198,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.r.a.a.d.k:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.q.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.r.a.a.d.i:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.q.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>
@@ -12169,13 +12214,13 @@
     3:21:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
     3:21:java.lang.String toString():609 -> toString
     22:22:java.lang.String toString():609:609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.r.a.a.d.j:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.q.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.r.a.a.d.l:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.q.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.r.a.a.d.p:
+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$Suppressor suppressor -> a
     java.util.Deque stack -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> c
@@ -12210,12 +12255,12 @@
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     25:25:void close():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.r.a.a.d.m:
+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 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.r.a.a.d.n:
+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 INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -12226,9 +12271,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.r.a.a.d.o:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.q.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.r.a.a.e.b:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.q.a.a.e.b:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -12248,12 +12293,12 @@
     107:107:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):81:81 -> a
     107:107:int divide(int,int,java.math.RoundingMode):340 -> a
     108:108:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.r.a.a.e.a:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.q.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.r.a.a.e.c:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.q.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.r.a.b.a:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.q.a.b.a:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -12267,7 +12312,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.r.a.b.b:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.q.a.b.b:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> c
     1:1:int getAsInt():243:243 -> d
@@ -12283,15 +12328,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.r.a.b.c:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.q.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.r.a.b.d:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.q.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.r.a.b.e:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.q.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
@@ -12311,11 +12356,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.r.a.b.f:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.q.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.r.a.b.g:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.q.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
@@ -12332,7 +12377,7 @@
     91:100:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     101:101:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     102:106:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.r.a.b.h:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.q.a.b.h:
     java.lang.Class[] PRIMITIVE_TYPES -> b
     java.lang.Object value -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12371,20 +12416,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.r.a.b.i:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.q.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.r.a.b.k:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.q.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.r.a.b.j:
+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 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.r.a.b.l.a:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.q.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
@@ -12394,7 +12439,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.r.a.b.l.d:
+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$Node header -> e
     java.util.Comparator NATURAL_ORDER -> h
     boolean $assertionsDisabled -> i
@@ -12437,12 +12482,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.r.a.b.l.b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.q.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.r.a.b.l.d$a:
+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 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
@@ -12450,11 +12495,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.r.a.b.l.c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.q.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.r.a.b.l.d$b:
+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 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
@@ -12466,10 +12511,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.r.a.b.l.e:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.q.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.r.a.b.l.d$c:
+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 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
@@ -12482,7 +12527,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> k
     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.r.a.b.l.f:
+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 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
@@ -12499,7 +12544,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.r.a.b.l.g.w:
+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.TypeAdapter STRING -> l
     com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUILDER -> m
     com.android.tools.r8.com.google.gson.TypeAdapter NUMBER -> j
@@ -12523,21 +12568,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.r.a.b.l.g.f:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.q.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.r.a.b.l.g.a:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.q.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.r.a.b.l.g.b:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.q.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
@@ -12546,7 +12591,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.r.a.b.l.g.c:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.q.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
@@ -12555,21 +12600,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.r.a.b.l.g.d:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.q.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.r.a.b.l.g.e:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.q.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.r.a.b.l.g.p:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.q.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
@@ -12582,63 +12627,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.r.a.b.l.g.g:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.q.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.r.a.b.l.g.h:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.q.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.r.a.b.l.g.i:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.q.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.r.a.b.l.g.j:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.q.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.r.a.b.l.g.k:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.q.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.r.a.b.l.g.l:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.q.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.r.a.b.l.g.m:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.q.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.r.a.b.l.g.n:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.q.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.r.a.b.l.g.o:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.q.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
@@ -12664,49 +12709,49 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.r.a.b.l.g.q:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.q.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.r.a.b.l.g.r:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.q.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.r.a.b.l.g.s:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.q.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.r.a.b.l.g.t:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.q.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.r.a.b.l.g.u:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.q.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.r.a.b.l.g.v:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.q.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.r.a.b.m.a:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.q.a.b.m.a:
     long peekedLong -> i
     char[] buffer -> c
     int stackSize -> m
@@ -12806,7 +12851,7 @@
     54:54:com.android.tools.r8.com.google.gson.stream.JsonToken peek():430:430 -> p
     1:5:void skipToEndOfLine():1411:1415 -> q
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.r.a.b.m.b:
+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 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
@@ -12821,7 +12866,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.r.a.b.m.c:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.q.a.b.m.c:
     java.lang.String deferredName -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> i
     int[] stack -> b
@@ -12874,7 +12919,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.r.a.b.m.d:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.q.a.b.m.d:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:21:void run(java.lang.String[]):190:210 -> a
@@ -12919,66 +12964,63 @@
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.AndroidApp inputApp -> d
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):71:75 -> <init>
-    1:192:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):0:191 -> a
-    1:192:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    193:203:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
-    193:203:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    193:203:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    204:204:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
-    204:204:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    204:204:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    205:205:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
-    205:205:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    205:205:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    206:206:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
-    206:206:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    206:206:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    207:207:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
-    207:207:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193 -> a
-    207:207:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    208:211:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):193:196 -> a
-    208:211:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    212:212:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    212:212:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
-    212:212:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    213:213:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    213:213:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    213:213:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196 -> a
-    213:213:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    214:214:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):196:196 -> a
-    214:214:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):60 -> a
-    215:215:com.android.tools.r8.utils.InternalOptions access$000(com.android.tools.r8.dex.ApplicationReader):60:60 -> a
-    216:216:com.android.tools.r8.graph.DexApplication read():79:79 -> a
-    217:221:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource):83:87 -> a
-    222:224:com.android.tools.r8.graph.DexApplication read(java.util.concurrent.ExecutorService):93:93 -> a
-    225:229:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):99:99 -> a
-    230:230:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):110:110 -> a
-    231:240:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):176:185 -> a
-    231:240:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):110 -> a
-    241:252:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):113:124 -> a
-    253:253:void dumpInputToFile(com.android.tools.r8.utils.AndroidApp,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):171:171 -> a
-    253:253:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):124 -> a
-    254:259:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):128:133 -> a
-    260:260:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131:131 -> a
-    261:263:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    261:263:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):131 -> a
-    264:295:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):136:167 -> a
-    296:296:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163:163 -> a
-    297:299:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    297:299:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):163 -> a
-    300:304:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):161:165 -> a
-    305:307:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):211:211 -> a
-    308:311:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):215:218 -> a
-    312:312:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    312:312:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218 -> a
-    313:313:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):218:218 -> a
-    314:315:void readMainDexList(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):225:226 -> a
-    316:324:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):227:235 -> a
-    325:325:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):231:231 -> a
-    326:326:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):234:234 -> a
-    1:1:com.android.tools.r8.utils.AndroidApp access$200(com.android.tools.r8.dex.ApplicationReader):60:60 -> b
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):70:74 -> <init>
+    1:190:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):0:189 -> a
+    1:190:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    191:201:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):79:89 -> a
+    191:201:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191 -> a
+    191:201:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    202:202:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):87:87 -> a
+    202:202:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191 -> a
+    202:202:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    203:203:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):85:85 -> a
+    203:203:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191 -> a
+    203:203:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    204:204:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):83:83 -> a
+    204:204:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191 -> a
+    204:204:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    205:205:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.AndroidApiLevel.getMinAndroidApiLevel(com.android.tools.r8.utils.DexVersion):81:81 -> a
+    205:205:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191 -> a
+    205:205:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    206:209:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):191:194 -> a
+    206:209:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    210:210:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):194 -> a
+    210:210:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    211:211:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    211:211:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    211:211:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):194 -> a
+    211:211:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    212:212:int validateOrComputeMinApiLevel(int,com.android.tools.r8.dex.DexReader):194:194 -> a
+    212:212:int access$100(com.android.tools.r8.dex.ApplicationReader,int,com.android.tools.r8.dex.DexReader):59 -> a
+    213:213:com.android.tools.r8.utils.InternalOptions access$000(com.android.tools.r8.dex.ApplicationReader):59:59 -> a
+    214:214:com.android.tools.r8.graph.DexApplication read():78:78 -> a
+    215:220:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource):82:87 -> a
+    221:223:com.android.tools.r8.graph.DexApplication read(java.util.concurrent.ExecutorService):91:91 -> a
+    224:228:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService):97:97 -> a
+    229:229:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):108:108 -> a
+    230:239:boolean verifyMainDexOptionsCompatible(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):174:183 -> a
+    230:239:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):108 -> a
+    240:251:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):111:122 -> a
+    252:252:void dumpInputToFile(com.android.tools.r8.utils.AndroidApp,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):169:169 -> a
+    252:252:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):122 -> a
+    253:258:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):126:131 -> a
+    259:295:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):129:165 -> a
+    296:296:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):161:161 -> a
+    297:297:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> a
+    297:297:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):159 -> a
+    298:303:com.android.tools.r8.graph.DexApplication read(com.android.tools.r8.StringResource,java.util.concurrent.ExecutorService,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):159:164 -> a
+    304:306:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):209:209 -> a
+    307:310:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):213:216 -> a
+    311:311:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    311:311:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):216 -> a
+    312:312:void lambda$readProguardMap$0(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):216:216 -> a
+    313:314:void readMainDexList(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):223:224 -> a
+    315:323:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):225:233 -> a
+    324:324:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):229:229 -> a
+    325:325:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):232:232 -> a
+    1:1:com.android.tools.r8.utils.AndroidApp access$200(com.android.tools.r8.dex.ApplicationReader):59:59 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.dex.a$a:
     java.util.List futures -> b
     com.android.tools.r8.graph.JarApplicationReader application -> f
@@ -12988,20 +13030,21 @@
     com.android.tools.r8.dex.ApplicationReader this$0 -> g
     boolean $assertionsDisabled -> h
     java.util.concurrent.ExecutorService executorService -> a
-    1:1:void <clinit>():240:240 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):252:252 -> <init>
-    2:10:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):246:254 -> <init>
-    1:3:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):279:279 -> a
-    4:9:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):289:294 -> a
-    10:10:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):293:293 -> a
-    11:14:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):296:296 -> a
-    16:16:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.graph.ClassKind):298:298 -> a
-    17:29:com.android.tools.r8.graph.JarClassFileReader readSources():309:321 -> a
-    30:47:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):327:344 -> a
-    48:54:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):349:355 -> a
-    55:63:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):354:362 -> a
-    64:67:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):361:364 -> a
-    1:19:void readDexSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):260:278 -> b
+    1:1:void <clinit>():238:238 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):250:250 -> <init>
+    2:10:void <init>(com.android.tools.r8.dex.ApplicationReader,java.util.concurrent.ExecutorService,java.util.List):244:252 -> <init>
+    1:87:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):0:86 -> a
+    1:87:java.lang.Object lambda$readClassSources$1(com.android.tools.r8.graph.JarClassFileReader,com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):294 -> a
+    88:88:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):278:278 -> a
+    89:89:void lambda$readDexSources$0(com.android.tools.r8.dex.DexParser,com.android.tools.r8.graph.ClassKind,java.util.Queue):277:277 -> a
+    90:95:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):287:292 -> a
+    96:96:com.android.tools.r8.graph.JarClassFileReader readClassSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):291:291 -> a
+    97:109:com.android.tools.r8.graph.JarClassFileReader readSources():304:316 -> a
+    110:127:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):322:339 -> a
+    128:134:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):344:350 -> a
+    135:143:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):349:357 -> a
+    144:147:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):356:359 -> a
+    1:19:void readDexSources(java.util.List,com.android.tools.r8.graph.ClassKind,java.util.Queue):258:276 -> b
 com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.dex.a$b:
     com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.dex.b:
@@ -13021,10 +13064,10 @@
     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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):155:155 -> <init>
     2:14: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.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):176:188 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():397:397 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():392:392 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):195 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):196:196 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():409:409 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():404:404 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):197:206 -> a
     15:16:void encodeChecksums(java.lang.Iterable):216:217 -> a
@@ -13034,10 +13077,10 @@
     28:28:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):266:266 -> a
     29:29:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):271:271 -> a
     30:34:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):282:286 -> a
-    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():409:409 -> a
+    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():404:404 -> a
     35:35:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):286 -> a
     36:43:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):289:296 -> a
-    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():405:405 -> a
+    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():400:400 -> a
     44:44:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):296 -> a
     45:49:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):300:304 -> a
     50:50:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):303:303 -> a
@@ -13095,9 +13138,9 @@
     40:40:void write(java.util.concurrent.ExecutorService):264:264 -> b
     41:56:void write(java.util.concurrent.ExecutorService):263:278 -> b
     57:115:void write(java.util.concurrent.ExecutorService):277:335 -> b
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> b
     116:116:void write(java.util.concurrent.ExecutorService):335 -> b
-    117:125:void write(java.util.concurrent.ExecutorService):335:343 -> b
+    117:126:void write(java.util.concurrent.ExecutorService):335:344 -> 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
@@ -13163,7 +13206,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():366:366 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> 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
@@ -13398,119 +13441,119 @@
     300:393:void com.android.tools.r8.dex.BinaryReader.align(int):0:93 -> a
     300:393:void ensureCodesInited(int):159 -> a
     300:393:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    394:406:com.android.tools.r8.graph.DexCode parseCodeItem():867:879 -> a
+    394:406:com.android.tools.r8.graph.DexCode parseCodeItem():865:877 -> a
     394:406:void ensureCodesInited(int):160 -> a
     394:406:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     407:407:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
-    407:407:com.android.tools.r8.graph.DexCode parseCodeItem():879 -> a
+    407:407:com.android.tools.r8.graph.DexCode parseCodeItem():877 -> a
     407:407:void ensureCodesInited(int):160 -> a
     407:407:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    408:423:com.android.tools.r8.graph.DexCode parseCodeItem():879:894 -> a
+    408:423:com.android.tools.r8.graph.DexCode parseCodeItem():877:892 -> a
     408:423:void ensureCodesInited(int):160 -> a
     408:423:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     424:424:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    424:424:com.android.tools.r8.graph.DexCode parseCodeItem():894 -> a
+    424:424:com.android.tools.r8.graph.DexCode parseCodeItem():892 -> a
     424:424:void ensureCodesInited(int):160 -> a
     424:424:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    425:425:com.android.tools.r8.graph.DexCode parseCodeItem():896:896 -> a
+    425:425:com.android.tools.r8.graph.DexCode parseCodeItem():894:894 -> a
     425:425:void ensureCodesInited(int):160 -> a
     425:425:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     426:470:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    426:470:com.android.tools.r8.graph.DexCode parseCodeItem():896 -> a
+    426:470:com.android.tools.r8.graph.DexCode parseCodeItem():894 -> a
     426:470:void ensureCodesInited(int):160 -> a
     426:470:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    471:475:com.android.tools.r8.graph.DexCode parseCodeItem():897:901 -> a
+    471:475:com.android.tools.r8.graph.DexCode parseCodeItem():895:899 -> a
     471:475:void ensureCodesInited(int):160 -> a
     471:475:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     476:476:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    476:476:com.android.tools.r8.graph.DexCode parseCodeItem():901 -> a
+    476:476:com.android.tools.r8.graph.DexCode parseCodeItem():899 -> a
     476:476:void ensureCodesInited(int):160 -> a
     476:476:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    477:479:com.android.tools.r8.graph.DexCode parseCodeItem():902:904 -> a
+    477:479:com.android.tools.r8.graph.DexCode parseCodeItem():900:902 -> a
     477:479:void ensureCodesInited(int):160 -> a
     477:479:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     480:528:int com.android.tools.r8.dex.BinaryReader.getSleb128():0:48 -> a
-    480:528:com.android.tools.r8.graph.DexCode parseCodeItem():904 -> a
+    480:528:com.android.tools.r8.graph.DexCode parseCodeItem():902 -> a
     480:528:void ensureCodesInited(int):160 -> a
     480:528:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    529:533:com.android.tools.r8.graph.DexCode parseCodeItem():905:909 -> a
+    529:533:com.android.tools.r8.graph.DexCode parseCodeItem():903:907 -> a
     529:533:void ensureCodesInited(int):160 -> a
     529:533:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     534:578:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    534:578:com.android.tools.r8.graph.DexCode parseCodeItem():909 -> a
+    534:578:com.android.tools.r8.graph.DexCode parseCodeItem():907 -> a
     534:578:void ensureCodesInited(int):160 -> a
     534:578:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    579:579:com.android.tools.r8.graph.DexCode parseCodeItem():910:910 -> a
+    579:579:com.android.tools.r8.graph.DexCode parseCodeItem():908:908 -> a
     579:579:void ensureCodesInited(int):160 -> a
     579:579:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     580:624:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    580:624:com.android.tools.r8.graph.DexCode parseCodeItem():910 -> a
+    580:624:com.android.tools.r8.graph.DexCode parseCodeItem():908 -> a
     580:624:void ensureCodesInited(int):160 -> a
     580:624:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    625:629:com.android.tools.r8.graph.DexCode parseCodeItem():911:915 -> a
+    625:629:com.android.tools.r8.graph.DexCode parseCodeItem():909:913 -> a
     625:629:void ensureCodesInited(int):160 -> a
     625:629:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     630:674:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    630:674:com.android.tools.r8.graph.DexCode parseCodeItem():915 -> a
+    630:674:com.android.tools.r8.graph.DexCode parseCodeItem():913 -> a
     630:674:void ensureCodesInited(int):160 -> a
     630:674:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    675:678:com.android.tools.r8.graph.DexCode parseCodeItem():917:920 -> a
+    675:678:com.android.tools.r8.graph.DexCode parseCodeItem():915:918 -> a
     675:678:void ensureCodesInited(int):160 -> a
     675:678:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     679:679:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):478:478 -> a
-    679:679:com.android.tools.r8.graph.DexCode parseCodeItem():921 -> a
+    679:679:com.android.tools.r8.graph.DexCode parseCodeItem():919 -> a
     679:679:void ensureCodesInited(int):160 -> a
     679:679:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    680:680:com.android.tools.r8.graph.DexCode parseCodeItem():926:926 -> a
+    680:680:com.android.tools.r8.graph.DexCode parseCodeItem():924:924 -> a
     680:680:void ensureCodesInited(int):160 -> a
     680:680:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     681:681:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    681:681:com.android.tools.r8.graph.DexCode parseCodeItem():926 -> a
+    681:681:com.android.tools.r8.graph.DexCode parseCodeItem():924 -> a
     681:681:void ensureCodesInited(int):160 -> a
     681:681:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    682:687:com.android.tools.r8.graph.DexCode parseCodeItem():927:932 -> a
+    682:687:com.android.tools.r8.graph.DexCode parseCodeItem():925:930 -> a
     682:687:void ensureCodesInited(int):160 -> a
     682:687:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
     688:689:void ensureCodesInited(int):161:162 -> a
     688:689:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):659 -> a
-    690:704:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):660:674 -> a
-    705:705:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    705:705:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):674 -> a
-    706:709:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):675:678 -> a
-    710:729:void addClassDefsTo(java.util.function.Consumer):684:703 -> a
-    730:730:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    730:730:void addClassDefsTo(java.util.function.Consumer):703 -> a
-    731:731:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    731:731:void addClassDefsTo(java.util.function.Consumer):703 -> a
-    732:734:void addClassDefsTo(java.util.function.Consumer):705:707 -> a
-    735:735:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    735:735:void addClassDefsTo(java.util.function.Consumer):707 -> a
-    736:738:void addClassDefsTo(java.util.function.Consumer):707:709 -> a
-    739:739:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    739:739:void addClassDefsTo(java.util.function.Consumer):709 -> a
-    740:777:void addClassDefsTo(java.util.function.Consumer):709:746 -> a
-    778:822:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    778:822:void addClassDefsTo(java.util.function.Consumer):746 -> a
-    823:823:void addClassDefsTo(java.util.function.Consumer):747:747 -> a
-    824:868:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    824:868:void addClassDefsTo(java.util.function.Consumer):747 -> a
-    869:869:void addClassDefsTo(java.util.function.Consumer):748:748 -> a
-    870:914:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    870:914:void addClassDefsTo(java.util.function.Consumer):748 -> a
-    915:915:void addClassDefsTo(java.util.function.Consumer):749:749 -> a
-    916:960:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    916:960:void addClassDefsTo(java.util.function.Consumer):749 -> a
-    961:963:void addClassDefsTo(java.util.function.Consumer):751:751 -> a
-    965:973:void addClassDefsTo(java.util.function.Consumer):753:761 -> a
-    974:988:void addClassDefsTo(java.util.function.Consumer):755:769 -> a
-    989:1023:void addClassDefsTo(java.util.function.Consumer):763:797 -> a
-    1024:1043:void addClassDefsTo(java.util.function.Consumer):780:799 -> a
-    1044:1044:void addClassDefsTo(java.util.function.Consumer):725:725 -> a
-    1045:1045:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    1045:1045:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1045:1045:void addClassDefsTo(java.util.function.Consumer):725 -> a
-    1046:1046:void addClassDefsTo(java.util.function.Consumer):725:725 -> a
-    1047:1047:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):777:777 -> a
+    690:703:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):660:673 -> a
+    704:704:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    704:704:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):673 -> a
+    705:708:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):673:676 -> a
+    709:728:void addClassDefsTo(java.util.function.Consumer):682:701 -> a
+    729:729:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    729:729:void addClassDefsTo(java.util.function.Consumer):701 -> a
+    730:730:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    730:730:void addClassDefsTo(java.util.function.Consumer):701 -> a
+    731:733:void addClassDefsTo(java.util.function.Consumer):703:705 -> a
+    734:734:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    734:734:void addClassDefsTo(java.util.function.Consumer):705 -> a
+    735:737:void addClassDefsTo(java.util.function.Consumer):705:707 -> a
+    738:738:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    738:738:void addClassDefsTo(java.util.function.Consumer):707 -> a
+    739:776:void addClassDefsTo(java.util.function.Consumer):707:744 -> a
+    777:821:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    777:821:void addClassDefsTo(java.util.function.Consumer):744 -> a
+    822:822:void addClassDefsTo(java.util.function.Consumer):745:745 -> a
+    823:867:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    823:867:void addClassDefsTo(java.util.function.Consumer):745 -> a
+    868:868:void addClassDefsTo(java.util.function.Consumer):746:746 -> a
+    869:913:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    869:913:void addClassDefsTo(java.util.function.Consumer):746 -> a
+    914:914:void addClassDefsTo(java.util.function.Consumer):747:747 -> a
+    915:959:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    915:959:void addClassDefsTo(java.util.function.Consumer):747 -> a
+    960:962:void addClassDefsTo(java.util.function.Consumer):749:749 -> a
+    964:972:void addClassDefsTo(java.util.function.Consumer):751:759 -> a
+    973:987:void addClassDefsTo(java.util.function.Consumer):753:767 -> a
+    988:1022:void addClassDefsTo(java.util.function.Consumer):761:795 -> a
+    1023:1042:void addClassDefsTo(java.util.function.Consumer):778:797 -> a
+    1043:1043:void addClassDefsTo(java.util.function.Consumer):723:723 -> a
+    1044:1044:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1044:1044:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1044:1044:void addClassDefsTo(java.util.function.Consumer):723 -> a
+    1045:1045:void addClassDefsTo(java.util.function.Consumer):723:723 -> a
+    1046:1046:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):775:775 -> a
     1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():455:456 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():456 -> b
@@ -13612,7 +13655,7 @@
     141:144:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():312:315 -> f
     145:145:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):333:333 -> f
     1:1:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():329:329 -> g
-    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):816:822 -> g
+    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):814:820 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):176:178 -> h
     4:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():319:319 -> h
     5:49:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> h
@@ -13676,141 +13719,141 @@
     258:259:com.android.tools.r8.graph.DexValue parseEncodedValue():201:202 -> i
     260:261:com.android.tools.r8.graph.DexValue parseEncodedValue():195:196 -> i
     262:264:com.android.tools.r8.graph.DexValue parseEncodedValue():188:190 -> i
-    1:10:com.android.tools.r8.dex.DexSection[] parseMap():827:836 -> j
+    1:10:com.android.tools.r8.dex.DexSection[] parseMap():825:834 -> j
     11:11:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    11:11:com.android.tools.r8.dex.DexSection[] parseMap():836 -> j
-    12:12:com.android.tools.r8.dex.DexSection[] parseMap():849:849 -> j
-    13:16:com.android.tools.r8.dex.DexSection[] parseMap():837:840 -> j
+    11:11:com.android.tools.r8.dex.DexSection[] parseMap():834 -> j
+    12:12:com.android.tools.r8.dex.DexSection[] parseMap():847:847 -> j
+    13:16:com.android.tools.r8.dex.DexSection[] parseMap():835:838 -> j
     17:17:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    17:17:com.android.tools.r8.dex.DexSection[] parseMap():846 -> j
-    18:18:com.android.tools.r8.dex.DexSection[] parseMap():846:846 -> j
-    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> j
+    17:17:com.android.tools.r8.dex.DexSection[] parseMap():844 -> j
+    18:18:com.android.tools.r8.dex.DexSection[] parseMap():844:844 -> j
+    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> j
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> j
-    19:19:com.android.tools.r8.dex.DexSection[] parseMap():846 -> j
-    20:30:com.android.tools.r8.dex.DexSection[] parseMap():846:856 -> j
-    31:36:com.android.tools.r8.dex.DexSection[] parseMap():855:860 -> j
+    19:19:com.android.tools.r8.dex.DexSection[] parseMap():844 -> j
+    20:30:com.android.tools.r8.dex.DexSection[] parseMap():844:854 -> j
+    31:36:com.android.tools.r8.dex.DexSection[] parseMap():853:858 -> j
     37:37:void com.android.tools.r8.dex.DexSection.setEnd(int):0:0 -> j
-    37:37:com.android.tools.r8.dex.DexSection[] parseMap():860 -> j
-    38:38:com.android.tools.r8.dex.DexSection[] parseMap():862:862 -> j
+    37:37:com.android.tools.r8.dex.DexSection[] parseMap():858 -> j
+    38:38:com.android.tools.r8.dex.DexSection[] parseMap():860:860 -> j
     39:39:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    39:39:com.android.tools.r8.dex.DexSection[] parseMap():862 -> j
+    39:39:com.android.tools.r8.dex.DexSection[] parseMap():860 -> j
     40:40:void com.android.tools.r8.dex.DexSection.setEnd(int):0:0 -> j
-    40:40:com.android.tools.r8.dex.DexSection[] parseMap():862 -> j
-    1:8:void parseStringIDs():804:811 -> k
+    40:40:com.android.tools.r8.dex.DexSection[] parseMap():860 -> j
+    1:8:void parseStringIDs():802:809 -> k
     1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():167:171 -> l
-    1:3:void populateStrings():948:950 -> m
-    1:3:void populateIndexTables():937 -> m
-    4:6:com.android.tools.r8.graph.DexString stringAt(int):1174:1176 -> m
-    4:6:void populateStrings():950 -> m
-    4:6:void populateIndexTables():937 -> m
+    1:3:void populateStrings():946:948 -> m
+    1:3:void populateIndexTables():935 -> m
+    4:6:com.android.tools.r8.graph.DexString stringAt(int):1172:1174 -> m
+    4:6:void populateStrings():948 -> m
+    4:6:void populateIndexTables():935 -> m
     7:51:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> m
-    7:51:com.android.tools.r8.graph.DexString stringAt(int):1176 -> m
-    7:51:void populateStrings():950 -> m
-    7:51:void populateIndexTables():937 -> m
-    52:55:com.android.tools.r8.graph.DexString stringAt(int):1177:1180 -> m
-    52:55:void populateStrings():950 -> m
-    52:55:void populateIndexTables():937 -> m
+    7:51:com.android.tools.r8.graph.DexString stringAt(int):1174 -> m
+    7:51:void populateStrings():948 -> m
+    7:51:void populateIndexTables():935 -> m
+    52:55:com.android.tools.r8.graph.DexString stringAt(int):1175:1178 -> m
+    52:55:void populateStrings():948 -> m
+    52:55:void populateIndexTables():935 -> m
     56:56:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> m
-    56:56:com.android.tools.r8.graph.DexString stringAt(int):1180 -> m
-    56:56:void populateStrings():950 -> m
-    56:56:void populateIndexTables():937 -> m
-    57:59:com.android.tools.r8.graph.DexString stringAt(int):1181:1183 -> m
-    57:59:void populateStrings():950 -> m
-    57:59:void populateIndexTables():937 -> m
-    60:60:void populateStrings():950:950 -> m
-    60:60:void populateIndexTables():937 -> m
-    61:69:void populateChecksums():980:988 -> m
-    61:69:void populateIndexTables():938 -> m
-    70:71:void populateTypes():971:972 -> m
-    70:71:void populateIndexTables():939 -> m
-    72:91:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):997:1016 -> m
-    72:91:void populateTypes():972 -> m
-    72:91:void populateIndexTables():939 -> m
-    92:92:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1011:1011 -> m
-    92:92:void populateTypes():972 -> m
-    92:92:void populateIndexTables():939 -> m
-    93:95:void populateTypes():973:975 -> m
-    93:95:void populateIndexTables():939 -> m
-    96:102:com.android.tools.r8.graph.DexType typeAt(int):1187:1193 -> m
-    96:102:void populateTypes():975 -> m
-    96:102:void populateIndexTables():939 -> m
-    103:103:void populateTypes():975:975 -> m
-    103:103:void populateIndexTables():939 -> m
-    104:105:void populateFields():1025:1026 -> m
-    104:105:void populateIndexTables():940 -> m
-    106:141:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1041:1076 -> m
-    106:141:void populateFields():1026 -> m
-    106:141:void populateIndexTables():940 -> m
-    142:152:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1073:1083 -> m
-    142:152:void populateFields():1026 -> m
-    142:152:void populateIndexTables():940 -> m
-    153:157:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1080:1084 -> m
-    153:157:void populateFields():1026 -> m
-    153:157:void populateIndexTables():940 -> m
-    158:158:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1069:1069 -> m
-    158:158:void populateFields():1026 -> m
-    158:158:void populateIndexTables():940 -> m
-    159:161:void populateFields():1027:1029 -> m
-    159:161:void populateIndexTables():940 -> m
-    162:174:com.android.tools.r8.graph.DexField fieldAt(int):1197:1209 -> m
-    162:174:void populateFields():1029 -> m
-    162:174:void populateIndexTables():940 -> m
-    175:175:void populateFields():1029:1029 -> m
-    175:175:void populateIndexTables():940 -> m
-    176:179:void populateProtos():1095:1098 -> m
-    176:179:void populateIndexTables():941 -> m
-    180:192:com.android.tools.r8.graph.DexProto protoAt(int):1270:1282 -> m
-    180:192:void populateProtos():1098 -> m
-    180:192:void populateIndexTables():941 -> m
-    193:193:void populateProtos():1098:1098 -> m
-    193:193:void populateIndexTables():941 -> m
-    194:195:void populateMethods():1103:1104 -> m
-    194:195:void populateIndexTables():942 -> m
-    196:231:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1120:1155 -> m
-    196:231:void populateMethods():1104 -> m
-    196:231:void populateIndexTables():942 -> m
-    232:242:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1152:1162 -> m
-    232:242:void populateMethods():1104 -> m
-    232:242:void populateIndexTables():942 -> m
-    243:247:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1159:1163 -> m
-    243:247:void populateMethods():1104 -> m
-    243:247:void populateIndexTables():942 -> m
-    248:248:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1148:1148 -> m
-    248:248:void populateMethods():1104 -> m
-    248:248:void populateIndexTables():942 -> m
-    249:251:void populateMethods():1105:1107 -> m
-    249:251:void populateIndexTables():942 -> m
-    252:264:com.android.tools.r8.graph.DexMethod methodAt(int):1286:1298 -> m
-    252:264:void populateMethods():1107 -> m
-    252:264:void populateIndexTables():942 -> m
-    265:265:com.android.tools.r8.graph.DexMethod methodAt(int):1295:1295 -> m
-    265:265:void populateMethods():1107 -> m
-    265:265:void populateIndexTables():942 -> m
-    266:266:void populateMethods():1107:1107 -> m
-    266:266:void populateIndexTables():942 -> m
-    267:270:void populateMethodHandles():955:958 -> m
-    267:270:void populateIndexTables():943 -> m
-    271:298:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1213:1240 -> m
-    271:298:void populateMethodHandles():958 -> m
-    271:298:void populateIndexTables():943 -> m
-    299:299:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1236:1236 -> m
-    299:299:void populateMethodHandles():958 -> m
-    299:299:void populateIndexTables():943 -> m
-    300:316:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1228:1244 -> m
-    300:316:void populateMethodHandles():958 -> m
-    300:316:void populateIndexTables():943 -> m
-    317:317:void populateMethodHandles():958:958 -> m
-    317:317:void populateIndexTables():943 -> m
-    318:321:void populateCallSites():963:966 -> m
-    318:321:void populateIndexTables():944 -> m
-    322:339:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1249:1266 -> m
-    322:339:void populateCallSites():966 -> m
-    322:339:void populateIndexTables():944 -> m
-    340:340:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1261:1261 -> m
-    340:340:void populateCallSites():966 -> m
-    340:340:void populateIndexTables():944 -> m
-    341:341:void populateCallSites():966:966 -> m
-    341:341:void populateIndexTables():944 -> m
+    56:56:com.android.tools.r8.graph.DexString stringAt(int):1178 -> m
+    56:56:void populateStrings():948 -> m
+    56:56:void populateIndexTables():935 -> m
+    57:59:com.android.tools.r8.graph.DexString stringAt(int):1179:1181 -> m
+    57:59:void populateStrings():948 -> m
+    57:59:void populateIndexTables():935 -> m
+    60:60:void populateStrings():948:948 -> m
+    60:60:void populateIndexTables():935 -> m
+    61:69:void populateChecksums():978:986 -> m
+    61:69:void populateIndexTables():936 -> m
+    70:71:void populateTypes():969:970 -> m
+    70:71:void populateIndexTables():937 -> m
+    72:91:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):995:1014 -> m
+    72:91:void populateTypes():970 -> m
+    72:91:void populateIndexTables():937 -> m
+    92:92:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1009:1009 -> m
+    92:92:void populateTypes():970 -> m
+    92:92:void populateIndexTables():937 -> m
+    93:95:void populateTypes():971:973 -> m
+    93:95:void populateIndexTables():937 -> m
+    96:102:com.android.tools.r8.graph.DexType typeAt(int):1185:1191 -> m
+    96:102:void populateTypes():973 -> m
+    96:102:void populateIndexTables():937 -> m
+    103:103:void populateTypes():973:973 -> m
+    103:103:void populateIndexTables():937 -> m
+    104:105:void populateFields():1023:1024 -> m
+    104:105:void populateIndexTables():938 -> m
+    106:141:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1074 -> m
+    106:141:void populateFields():1024 -> m
+    106:141:void populateIndexTables():938 -> m
+    142:152:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1071:1081 -> m
+    142:152:void populateFields():1024 -> m
+    142:152:void populateIndexTables():938 -> m
+    153:157:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1078:1082 -> m
+    153:157:void populateFields():1024 -> m
+    153:157:void populateIndexTables():938 -> m
+    158:158:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1067:1067 -> m
+    158:158:void populateFields():1024 -> m
+    158:158:void populateIndexTables():938 -> m
+    159:161:void populateFields():1025:1027 -> m
+    159:161:void populateIndexTables():938 -> m
+    162:174:com.android.tools.r8.graph.DexField fieldAt(int):1195:1207 -> m
+    162:174:void populateFields():1027 -> m
+    162:174:void populateIndexTables():938 -> m
+    175:175:void populateFields():1027:1027 -> m
+    175:175:void populateIndexTables():938 -> m
+    176:179:void populateProtos():1093:1096 -> m
+    176:179:void populateIndexTables():939 -> m
+    180:192:com.android.tools.r8.graph.DexProto protoAt(int):1268:1280 -> m
+    180:192:void populateProtos():1096 -> m
+    180:192:void populateIndexTables():939 -> m
+    193:193:void populateProtos():1096:1096 -> m
+    193:193:void populateIndexTables():939 -> m
+    194:195:void populateMethods():1101:1102 -> m
+    194:195:void populateIndexTables():940 -> m
+    196:231:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1153 -> m
+    196:231:void populateMethods():1102 -> m
+    196:231:void populateIndexTables():940 -> m
+    232:242:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1150:1160 -> m
+    232:242:void populateMethods():1102 -> m
+    232:242:void populateIndexTables():940 -> m
+    243:247:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1157:1161 -> m
+    243:247:void populateMethods():1102 -> m
+    243:247:void populateIndexTables():940 -> m
+    248:248:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1146:1146 -> m
+    248:248:void populateMethods():1102 -> m
+    248:248:void populateIndexTables():940 -> m
+    249:251:void populateMethods():1103:1105 -> m
+    249:251:void populateIndexTables():940 -> m
+    252:264:com.android.tools.r8.graph.DexMethod methodAt(int):1284:1296 -> m
+    252:264:void populateMethods():1105 -> m
+    252:264:void populateIndexTables():940 -> m
+    265:265:com.android.tools.r8.graph.DexMethod methodAt(int):1293:1293 -> m
+    265:265:void populateMethods():1105 -> m
+    265:265:void populateIndexTables():940 -> m
+    266:266:void populateMethods():1105:1105 -> m
+    266:266:void populateIndexTables():940 -> m
+    267:270:void populateMethodHandles():953:956 -> m
+    267:270:void populateIndexTables():941 -> m
+    271:298:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1211:1238 -> m
+    271:298:void populateMethodHandles():956 -> m
+    271:298:void populateIndexTables():941 -> m
+    299:299:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1234:1234 -> m
+    299:299:void populateMethodHandles():956 -> m
+    299:299:void populateIndexTables():941 -> m
+    300:316:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1226:1242 -> m
+    300:316:void populateMethodHandles():956 -> m
+    300:316:void populateIndexTables():941 -> m
+    317:317:void populateMethodHandles():956:956 -> m
+    317:317:void populateIndexTables():941 -> m
+    318:321:void populateCallSites():961:964 -> m
+    318:321:void populateIndexTables():942 -> m
+    322:339:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1247:1264 -> m
+    322:339:void populateCallSites():964 -> m
+    322:339:void populateIndexTables():942 -> m
+    340:340:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1259:1259 -> m
+    340:340:void populateCallSites():964 -> m
+    340:340:void populateIndexTables():942 -> m
+    341:341:void populateCallSites():964:964 -> m
+    341:341:void populateIndexTables():942 -> m
 com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.n$a:
 com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.n$b:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> g
@@ -13821,25 +13864,25 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
-    1:11:void <clinit>():1303:1313 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1325:1329 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1333:1333 -> a
+    1:11:void <clinit>():1301:1311 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1323:1327 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1331:1331 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.n$c:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
     java.util.List innerClasses -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():1337:1337 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1363:1363 -> <init>
-    2:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1340:1385 -> <init>
-    48:93:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1384:1429 -> <init>
-    94:109:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1424:1439 -> <init>
-    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1345:1351 -> a
-    8:10:void ensureAnnotations(int):1445:1447 -> a
-    11:12:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1452:1453 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1359:1359 -> b
-    1:1:java.util.List getInnerClasses():1355:1355 -> c
+    1:1:void <clinit>():1335:1335 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1361:1361 -> <init>
+    2:47:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1338:1383 -> <init>
+    48:93:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1382:1427 -> <init>
+    94:109:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):1422:1437 -> <init>
+    1:7:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1343:1349 -> a
+    8:10:void ensureAnnotations(int):1443:1445 -> a
+    11:12:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1450:1451 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1357:1357 -> b
+    1:1:java.util.List getInnerClasses():1353:1353 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.n$d:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
@@ -13897,248 +13940,243 @@
     com.android.tools.r8.naming.NamingLens namingLens -> e
     com.android.tools.r8.dex.FileWriter$MixedSectionOffsets mixedSectionOffsets -> g
     com.android.tools.r8.graph.DexApplication application -> c
-    1:1:void <clinit>():76:76 -> <clinit>
-    1:1: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):108:108 -> <init>
-    2:19: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):99:116 -> <init>
-    1:1:com.android.tools.r8.dex.FileWriter$MixedSectionOffsets access$300(com.android.tools.r8.dex.FileWriter):76:76 -> a
-    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:122 -> a
+    1:1:void <clinit>():81:81 -> <clinit>
+    1:1: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):113:113 -> <init>
+    2:19: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):104:121 -> <init>
+    1:1:com.android.tools.r8.dex.FileWriter$MixedSectionOffsets access$300(com.android.tools.r8.dex.FileWriter):81:81 -> a
+    2:3:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126:127 -> 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):122 -> a
-    5:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124:126 -> a
+    4:4:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):127 -> a
+    5:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):129:131 -> a
     8:88:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    8:88:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126 -> a
-    89:89:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):127:127 -> a
+    8:88:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):131 -> a
+    89:89:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):132:132 -> a
     90:90:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    90:90:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):127 -> a
-    91:92:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):128:129 -> a
+    90:90:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):132 -> a
+    91:92:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):133:134 -> a
     93:93:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    93:93:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):129 -> a
-    94:94:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):130:130 -> a
-    95:95:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):125:125 -> a
-    96:114:com.android.tools.r8.dex.FileWriter collect():136:154 -> a
-    115:152:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):264:301 -> a
-    153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    153:153:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):301 -> a
-    154:154:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):301:301 -> a
-    155:156:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):277:278 -> a
-    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    157:157:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):278 -> a
-    158:158:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):278:278 -> a
-    159:164:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):332:337 -> a
-    165:171:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):353:359 -> a
-    165:171:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):336 -> a
-    172:174:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):364:366 -> a
-    175:179:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):385:389 -> a
-    180:181:void writeTypeItem(com.android.tools.r8.graph.DexType):438:439 -> a
-    182:184:void writeProtoItem(com.android.tools.r8.graph.DexProto):443:445 -> a
-    185:192:void writeFieldItem(com.android.tools.r8.graph.DexField):449:456 -> a
-    193:200:void writeMethodItem(com.android.tools.r8.graph.DexMethod):460:467 -> a
-    201:215:void writeCodeItem(com.android.tools.r8.graph.DexCode):490:504 -> a
-    216:216:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):166:166 -> a
-    216:216:void writeCodeItem(com.android.tools.r8.graph.DexCode):504 -> a
-    217:225:void writeCodeItem(com.android.tools.r8.graph.DexCode):505:513 -> a
-    226:306:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    226:306:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    307:312:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:519 -> a
-    313:397:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):0:84 -> a
-    313:397:void writeCodeItem(com.android.tools.r8.graph.DexCode):519 -> a
-    398:399:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:521 -> a
-    400:480:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    400:480:void writeCodeItem(com.android.tools.r8.graph.DexCode):521 -> a
-    481:481:void writeCodeItem(com.android.tools.r8.graph.DexCode):522:522 -> a
-    482:562:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    482:562:void writeCodeItem(com.android.tools.r8.graph.DexCode):522 -> a
-    563:563:void writeCodeItem(com.android.tools.r8.graph.DexCode):525:525 -> a
-    564:644:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    564:644:void writeCodeItem(com.android.tools.r8.graph.DexCode):525 -> a
-    645:654:void writeCodeItem(com.android.tools.r8.graph.DexCode):528:537 -> a
-    655:660:void writeTypeList(com.android.tools.r8.graph.DexTypeList):542:547 -> a
-    661:662:void writeStringData(com.android.tools.r8.graph.DexString):552:553 -> a
-    663:743:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    663:743:void writeStringData(com.android.tools.r8.graph.DexString):553 -> a
-    744:744:void writeStringData(com.android.tools.r8.graph.DexString):554:554 -> a
-    745:747:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):558:560 -> a
-    748:748:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    748:748:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):560 -> a
-    749:750:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):562:563 -> a
-    751:753:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):567:569 -> a
-    754:754:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    754:754:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):569 -> a
-    755:759:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):571:575 -> a
-    760:760:int lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):572:572 -> a
-    761:770:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):580:589 -> a
-    771:773:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):595:597 -> a
-    774:788:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):602:616 -> a
-    789:789:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):613:613 -> a
-    790:797:void writeEncodedFields(java.util.List):621:628 -> a
-    798:878:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    798:878:void writeEncodedFields(java.util.List):628 -> a
-    879:879:void writeEncodedFields(java.util.List):630:630 -> a
-    880:960:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    880:960:void writeEncodedFields(java.util.List):630 -> a
-    961:961:void writeEncodedFields(java.util.List):631:631 -> a
-    962:962:int lambda$writeEncodedFields$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):622:622 -> a
-    963:969:void writeEncodedMethods(java.util.List,boolean):637:643 -> a
-    970:1050:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    970:1050:void writeEncodedMethods(java.util.List,boolean):643 -> a
-    1051:1051:void writeEncodedMethods(java.util.List,boolean):645:645 -> a
-    1052:1132:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    1052:1132:void writeEncodedMethods(java.util.List,boolean):645 -> a
-    1133:1137:void writeEncodedMethods(java.util.List,boolean):646:650 -> a
-    1138:1218:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    1138:1218:void writeEncodedMethods(java.util.List,boolean):650 -> a
-    1219:1219:void writeEncodedMethods(java.util.List,boolean):652:652 -> a
-    1220:1300:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    1220:1300:void writeEncodedMethods(java.util.List,boolean):652 -> a
-    1301:1301:void writeEncodedMethods(java.util.List,boolean):655:655 -> a
-    1302:1302:int lambda$writeEncodedMethods$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):638:638 -> a
-    1303:1306:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):682:685 -> a
-    1307:1309:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):722:724 -> a
-    1310:1310:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1310:1310:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):724 -> a
-    1311:1311:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):726:726 -> a
-    1312:1392:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
-    1312:1392:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):726 -> a
-    1393:1394:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):727:728 -> a
-    1395:1401:int writeMapItem(int,int,int):736:742 -> a
-    1402:1402:void checkThatInvokeCustomIsAllowed():1384:1384 -> a
-    1402:1402:void writeCallSite(com.android.tools.r8.graph.DexCallSite):716 -> a
-    1403:1404:void writeCallSite(com.android.tools.r8.graph.DexCallSite):717:718 -> a
-    1405:1405:void checkThatInvokeCustomIsAllowed():1385:1385 -> a
-    1405:1405:void writeCallSite(com.android.tools.r8.graph.DexCallSite):716 -> a
-    1406:1406:void checkThatInvokeCustomIsAllowed():1384:1384 -> a
-    1406:1406:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    1407:1412:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):692:697 -> a
-    1413:1421:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):694:702 -> a
-    1422:1422:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    1422:1422:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):704 -> a
-    1423:1423:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):705:705 -> a
-    1424:1424:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    1424:1424:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):707 -> a
-    1425:1430:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):707:712 -> a
-    1431:1431:void checkThatInvokeCustomIsAllowed():1385:1385 -> a
-    1431:1431:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    1:7:void checkInterfaceMethods():245:251 -> b
-    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161 -> b
-    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164:164 -> b
-    9:22:boolean verifyNames():306:319 -> b
-    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164 -> b
-    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():166:176 -> b
-    34:34:int sizeOfCodeItems(java.lang.Iterable):395:395 -> b
-    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():176 -> b
-    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):405:427 -> b
-    35:57:int sizeOfCodeItems(java.lang.Iterable):397 -> b
-    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():176 -> 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):428 -> b
-    58:58:int sizeOfCodeItems(java.lang.Iterable):397 -> b
-    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():176 -> b
-    59:68:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():176:185 -> b
-    69:70:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):485:486 -> b
-    69:70:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():186 -> b
-    71:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():192:202 -> b
-    82:82:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
-    82:82:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():202 -> b
-    83:83:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():203:203 -> b
-    84:84:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
-    84:84:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():203 -> b
-    85:85:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():205:205 -> b
-    86:86:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
-    86:86:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():205 -> b
-    87:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207:207 -> b
-    88:88:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
-    88:88:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> b
-    89:89:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():209:209 -> b
-    90:90:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):380:380 -> b
-    90:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():209 -> b
-    91:99:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():211:219 -> b
-    100:105:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):747:752 -> b
-    100:105:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    106:109:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):751:754 -> b
-    106:109:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    110:113:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):753:756 -> b
-    110:113:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    114:117:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):755:758 -> b
-    114:117:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    118:121:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):757:760 -> b
-    118:121:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    122:125:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):759:762 -> b
-    122:125:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    126:129:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):761:764 -> b
-    126:129:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    130:133:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):763:766 -> b
-    130:133:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    134:137:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):765:768 -> b
-    134:137:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    138:141:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):767:770 -> b
-    138:141:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    142:145:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):769:772 -> b
-    142:145:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    146:149:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):771:774 -> b
-    146:149:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    150:153:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):773:776 -> b
-    150:153:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    154:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):775:778 -> b
-    154:157:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    158:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):777:780 -> b
-    158:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    162:165:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):779:782 -> b
-    162:165:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    166:170:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):781:785 -> b
-    166:170:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    171:176:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):783:788 -> b
-    171:176:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    177:183:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):786:792 -> b
-    177:183:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220 -> b
-    184:193:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():221:230 -> b
-    194:196:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):372:374 -> b
-    194:196:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():230 -> b
-    197:199:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():231:233 -> b
-    200:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():232:232 -> b
-    201:207:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):796:802 -> b
-    201:207:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():236 -> b
-    208:209:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):801:802 -> b
-    208:209:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():236 -> b
-    210:244:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):798:832 -> b
-    210:244:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():236 -> b
-    245:247:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):837:839 -> b
-    245:247:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():237 -> b
-    248:250:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):838:840 -> b
-    248:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():237 -> b
-    251:253:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):847:849 -> b
-    251:253:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():238 -> b
-    254:257:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):848:851 -> b
-    254:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():238 -> b
-    258:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241:241 -> b
-    259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):842:842 -> b
-    259:259:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():237 -> b
-    260:260:void writeStringItem(com.android.tools.r8.graph.DexString):434:434 -> b
-    261:261:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):615:615 -> b
-    262:268:void writeClassData(com.android.tools.r8.graph.DexProgramClass):661:667 -> b
-    269:349:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
-    269:349:void writeClassData(com.android.tools.r8.graph.DexProgramClass):667 -> b
-    350:350:void writeClassData(com.android.tools.r8.graph.DexProgramClass):668:668 -> b
-    351:431:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
-    351:431:void writeClassData(com.android.tools.r8.graph.DexProgramClass):668 -> b
-    432:432:void writeClassData(com.android.tools.r8.graph.DexProgramClass):669:669 -> b
-    433:513:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
-    433:513:void writeClassData(com.android.tools.r8.graph.DexProgramClass):669 -> b
-    514:514:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670:670 -> b
-    515:595:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
-    515:595:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670 -> b
-    596:600:void writeClassData(com.android.tools.r8.graph.DexProgramClass):671:675 -> b
-    1:15:java.util.List sortDexCodesByClassName():327:341 -> c
-    16:19:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):471:474 -> c
-    20:24:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):473:477 -> c
-    25:29:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):476:480 -> c
-    30:32:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):479:481 -> c
-    33:33:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):617:617 -> c
+    93:93:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):134 -> a
+    94:94:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):135:135 -> a
+    95:95:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):130:130 -> a
+    96:127:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:300 -> a
+    128:128:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    128:128:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):300 -> a
+    129:129:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):300:300 -> a
+    130:131:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):280:281 -> a
+    132:132:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    132:132:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):281 -> a
+    133:133:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
+    134:139:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):331:336 -> a
+    140:146:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):352:358 -> a
+    140:146:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):335 -> a
+    147:149:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):363:365 -> a
+    150:154:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):384:388 -> a
+    155:156:void writeTypeItem(com.android.tools.r8.graph.DexType):437:438 -> a
+    157:159:void writeProtoItem(com.android.tools.r8.graph.DexProto):442:444 -> a
+    160:167:void writeFieldItem(com.android.tools.r8.graph.DexField):448:455 -> a
+    168:175:void writeMethodItem(com.android.tools.r8.graph.DexMethod):459:466 -> a
+    176:190:void writeCodeItem(com.android.tools.r8.graph.DexCode):489:503 -> a
+    191:191:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):166:166 -> a
+    191:191:void writeCodeItem(com.android.tools.r8.graph.DexCode):503 -> a
+    192:200:void writeCodeItem(com.android.tools.r8.graph.DexCode):504:512 -> a
+    201:281:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    201:281:void writeCodeItem(com.android.tools.r8.graph.DexCode):512 -> a
+    282:287:void writeCodeItem(com.android.tools.r8.graph.DexCode):513:518 -> a
+    288:372:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):0:84 -> a
+    288:372:void writeCodeItem(com.android.tools.r8.graph.DexCode):518 -> a
+    373:374:void writeCodeItem(com.android.tools.r8.graph.DexCode):519:520 -> a
+    375:455:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    375:455:void writeCodeItem(com.android.tools.r8.graph.DexCode):520 -> a
+    456:456:void writeCodeItem(com.android.tools.r8.graph.DexCode):521:521 -> a
+    457:537:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    457:537:void writeCodeItem(com.android.tools.r8.graph.DexCode):521 -> a
+    538:538:void writeCodeItem(com.android.tools.r8.graph.DexCode):524:524 -> a
+    539:619:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    539:619:void writeCodeItem(com.android.tools.r8.graph.DexCode):524 -> a
+    620:629:void writeCodeItem(com.android.tools.r8.graph.DexCode):527:536 -> a
+    630:635:void writeTypeList(com.android.tools.r8.graph.DexTypeList):541:546 -> a
+    636:637:void writeStringData(com.android.tools.r8.graph.DexString):551:552 -> a
+    638:718:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    638:718:void writeStringData(com.android.tools.r8.graph.DexString):552 -> a
+    719:719:void writeStringData(com.android.tools.r8.graph.DexString):553:553 -> a
+    720:722:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):557:559 -> a
+    723:723:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    723:723:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):559 -> a
+    724:725:void writeAnnotation(com.android.tools.r8.graph.DexAnnotation):561:562 -> a
+    726:728:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):566:568 -> a
+    729:729:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    729:729:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):568 -> a
+    730:734:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):570:574 -> a
+    735:735:int lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):571:571 -> a
+    736:745:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):579:588 -> a
+    746:748:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):594:596 -> a
+    749:763:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):601:615 -> a
+    764:764:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):612:612 -> a
+    765:772:void writeEncodedFields(java.util.List):620:627 -> a
+    773:853:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    773:853:void writeEncodedFields(java.util.List):627 -> a
+    854:854:void writeEncodedFields(java.util.List):629:629 -> a
+    855:935:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    855:935:void writeEncodedFields(java.util.List):629 -> a
+    936:936:void writeEncodedFields(java.util.List):630:630 -> a
+    937:937:int lambda$writeEncodedFields$6(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):621:621 -> a
+    938:944:void writeEncodedMethods(java.lang.Iterable,boolean):636:642 -> a
+    945:1025:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    945:1025:void writeEncodedMethods(java.lang.Iterable,boolean):642 -> a
+    1026:1026:void writeEncodedMethods(java.lang.Iterable,boolean):644:644 -> a
+    1027:1107:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    1027:1107:void writeEncodedMethods(java.lang.Iterable,boolean):644 -> a
+    1108:1112:void writeEncodedMethods(java.lang.Iterable,boolean):645:649 -> a
+    1113:1193:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    1113:1193:void writeEncodedMethods(java.lang.Iterable,boolean):649 -> a
+    1194:1194:void writeEncodedMethods(java.lang.Iterable,boolean):651:651 -> a
+    1195:1275:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    1195:1275:void writeEncodedMethods(java.lang.Iterable,boolean):651 -> a
+    1276:1276:void writeEncodedMethods(java.lang.Iterable,boolean):654:654 -> a
+    1277:1277:int lambda$writeEncodedMethods$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):637:637 -> a
+    1278:1281:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):681:684 -> a
+    1282:1289:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):689:696 -> a
+    1290:1298:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:701 -> a
+    1299:1299:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    1299:1299:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):703 -> a
+    1300:1300:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):704:704 -> a
+    1301:1301:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
+    1301:1301:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):706 -> a
+    1302:1307:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):706:711 -> a
+    1308:1310:void writeCallSite(com.android.tools.r8.graph.DexCallSite):715:717 -> a
+    1311:1313:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):721:723 -> a
+    1314:1314:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1314:1314:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):723 -> a
+    1315:1315:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):725:725 -> a
+    1316:1396:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> a
+    1316:1396:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):725 -> a
+    1397:1398:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):726:727 -> a
+    1399:1405:int writeMapItem(int,int,int):735:741 -> a
+    1406:1407:void checkThatInvokeCustomIsAllowed():1383:1384 -> a
+    1:19:com.android.tools.r8.dex.FileWriter collect():141:159 -> b
+    20:20:void writeStringItem(com.android.tools.r8.graph.DexString):433:433 -> b
+    21:21:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):614:614 -> b
+    22:28:void writeClassData(com.android.tools.r8.graph.DexProgramClass):660:666 -> b
+    29:109:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
+    29:109:void writeClassData(com.android.tools.r8.graph.DexProgramClass):666 -> b
+    110:110:void writeClassData(com.android.tools.r8.graph.DexProgramClass):667:667 -> b
+    111:191:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
+    111:191:void writeClassData(com.android.tools.r8.graph.DexProgramClass):667 -> b
+    192:192:void writeClassData(com.android.tools.r8.graph.DexProgramClass):668:668 -> b
+    193:273:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
+    193:273:void writeClassData(com.android.tools.r8.graph.DexProgramClass):668 -> b
+    274:274:void writeClassData(com.android.tools.r8.graph.DexProgramClass):669:669 -> b
+    275:355:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):0:80 -> b
+    275:355:void writeClassData(com.android.tools.r8.graph.DexProgramClass):669 -> b
+    356:360:void writeClassData(com.android.tools.r8.graph.DexProgramClass):670:674 -> b
+    1:7:void checkInterfaceMethods():250:256 -> c
+    1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():166 -> c
+    8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():169:169 -> c
+    9:22:boolean verifyNames():305:318 -> c
+    9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():169 -> c
+    23:33:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171:181 -> c
+    34:34:int sizeOfCodeItems(java.lang.Iterable):394:394 -> c
+    34:34:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():181 -> c
+    35:57:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):404:426 -> c
+    35:57:int sizeOfCodeItems(java.lang.Iterable):396 -> c
+    35:57:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():181 -> c
+    58:58:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    58:58:int sizeOfCodeItem(com.android.tools.r8.graph.DexCode):427 -> c
+    58:58:int sizeOfCodeItems(java.lang.Iterable):396 -> c
+    58:58:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():181 -> c
+    59:68:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():181:190 -> c
+    69:70:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):484:485 -> c
+    69:70:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():191 -> c
+    71:81:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():197:207 -> c
+    82:82:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):379:379 -> c
+    82:82:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():207 -> c
+    83:83:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():208:208 -> c
+    84:84:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):379:379 -> c
+    84:84:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():208 -> c
+    85:85:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():210:210 -> c
+    86:86:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):379:379 -> c
+    86:86:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():210 -> c
+    87:87:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():212:212 -> c
+    88:88:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):379:379 -> c
+    88:88:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():212 -> c
+    89:89:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214:214 -> c
+    90:90:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer):379:379 -> c
+    90:90:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():214 -> c
+    91:94:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():216:219 -> c
+    95:98:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():218:221 -> c
+    99:103:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():220:224 -> c
+    104:109:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):746:751 -> c
+    104:109:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    110:113:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):750:753 -> c
+    110:113:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    114:117:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):752:755 -> c
+    114:117:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    118:121:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):754:757 -> c
+    118:121:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    122:125:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):756:759 -> c
+    122:125:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    126:129:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):758:761 -> c
+    126:129:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    130:133:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):760:763 -> c
+    130:133:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    134:137:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):762:765 -> c
+    134:137:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    138:141:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):764:767 -> c
+    138:141:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    142:145:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):766:769 -> c
+    142:145:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    146:149:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):768:771 -> c
+    146:149:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    150:153:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):770:773 -> c
+    150:153:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    154:157:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):772:775 -> c
+    154:157:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    158:161:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):774:777 -> c
+    158:161:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    162:165:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):776:779 -> c
+    162:165:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    166:169:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):778:781 -> c
+    166:169:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    170:174:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):780:784 -> c
+    170:174:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    175:180:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):782:787 -> c
+    175:180:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    181:187:void writeMap(com.android.tools.r8.dex.FileWriter$Layout):785:791 -> c
+    181:187:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():225 -> c
+    188:197:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():226:235 -> c
+    198:200:void writeFixedSectionItems(com.android.tools.r8.graph.DexProgramClass[],int,java.util.function.Consumer):371:373 -> c
+    198:200:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():235 -> c
+    201:203:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():236:238 -> c
+    204:204:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():237:237 -> c
+    205:211:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):795:801 -> c
+    205:211:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241 -> c
+    212:213:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):800:801 -> c
+    212:213:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241 -> c
+    214:248:void writeHeader(com.android.tools.r8.dex.FileWriter$Layout):797:831 -> c
+    214:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():241 -> c
+    249:251:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):836:838 -> c
+    249:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():242 -> c
+    252:254:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):837:839 -> c
+    252:254:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():242 -> c
+    255:257:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):846:848 -> c
+    255:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():243 -> c
+    258:261:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):847:850 -> c
+    258:261:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():243 -> c
+    262:262:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():246:246 -> c
+    263:263:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):841:841 -> c
+    263:263:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():242 -> c
+    264:267:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):470:473 -> c
+    268:272:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):472:476 -> c
+    273:277:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):475:479 -> c
+    278:280:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):478:480 -> c
+    281:281:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):616:616 -> c
+    1:15:java.util.List sortDexCodesByClassName():326:340 -> d
 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
     int length -> b
-    1:1:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):79:79 -> <init>
-    2:4:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):85:87 -> <init>
+    1:1:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):84:84 -> <init>
+    2:4:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):90:92 -> <init>
 com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.dex.s:
     int annotationSetsOffset -> n
     int annotationSetRefListsOffset -> o
@@ -14161,39 +14199,39 @@
     int mapOffset -> s
     int annotationDirectoriesOffset -> p
     int classDataOffset -> q
-    1:1:void <clinit>():859:859 -> <clinit>
-    1:1:void <init>(int,int,int,int,int,int,int,int,int):891:891 -> <init>
-    2:35:void <init>(int,int,int,int,int,int,int,int,int):875:908 -> <init>
+    1:1:void <clinit>():858:858 -> <clinit>
+    1:1:void <init>(int,int,int,int,int,int,int,int,int):890:890 -> <init>
+    2:35:void <init>(int,int,int,int,int,int,int,int,int):874:907 -> <init>
     void alreadySetOffset(int) -> a
-    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):913:922 -> a
-    11:11:boolean isValidOffset(int,boolean):932:932 -> a
-    12:13:int getAnnotationDirectoriesOffset():1010:1011 -> a
-    1:2:int getAnnotationSetRefListsOffset():1000:1001 -> b
-    3:4:void setAnnotationDirectoriesOffset(int):1015:1016 -> b
-    1:2:int getAnnotationSetsOffset():986:987 -> c
-    3:4:void setAnnotationSetRefListsOffset(int):1005:1006 -> c
-    1:2:int getAnnotationsOffset():976:977 -> d
-    3:4:void setAnnotationSetsOffset(int):995:996 -> d
-    1:2:void setAnnotationsOffset(int):981:982 -> e
-    3:4:int getClassDataOffset():1020:1021 -> e
-    1:2:int getCodesOffset():936:937 -> f
-    3:4:void setClassDataOffset(int):1025:1026 -> f
-    1:2:void setCodesOffset(int):941:942 -> g
-    3:3:int getEndOfFile():1048:1048 -> g
-    3:3:int getDataSectionSize():926 -> g
-    4:5:int getDataSectionSize():926:927 -> g
-    1:2:int getDebugInfosOffset():946:947 -> h
-    3:4:void setDebugInfosOffset(int):951:952 -> h
-    1:2:int getEncodedArrarysOffset():1030:1031 -> i
-    3:4:void setEncodedArrarysOffset(int):1035:1036 -> i
-    1:1:int getEndOfFile():1048:1048 -> j
-    2:2:void setEndOfFile(int):1052:1052 -> j
-    1:1:int getMapOffset():1040:1040 -> k
-    2:2:void setMapOffset(int):1044:1044 -> k
-    1:2:int getStringDataOffsets():966:967 -> l
-    3:4:void setStringDataOffsets(int):971:972 -> l
-    1:2:int getTypeListsOffset():956:957 -> m
-    3:4:void setTypeListsOffset(int):961:962 -> m
+    1:10:com.android.tools.r8.dex.FileWriter$Layout from(com.android.tools.r8.graph.ObjectToOffsetMapping):912:921 -> a
+    11:11:boolean isValidOffset(int,boolean):931:931 -> a
+    12:13:int getAnnotationDirectoriesOffset():1009:1010 -> a
+    1:2:int getAnnotationSetRefListsOffset():999:1000 -> b
+    3:4:void setAnnotationDirectoriesOffset(int):1014:1015 -> b
+    1:2:int getAnnotationSetsOffset():985:986 -> c
+    3:4:void setAnnotationSetRefListsOffset(int):1004:1005 -> c
+    1:2:int getAnnotationsOffset():975:976 -> d
+    3:4:void setAnnotationSetsOffset(int):994:995 -> d
+    1:2:void setAnnotationsOffset(int):980:981 -> e
+    3:4:int getClassDataOffset():1019:1020 -> e
+    1:2:int getCodesOffset():935:936 -> f
+    3:4:void setClassDataOffset(int):1024:1025 -> f
+    1:2:void setCodesOffset(int):940:941 -> g
+    3:3:int getEndOfFile():1047:1047 -> g
+    3:3:int getDataSectionSize():925 -> g
+    4:5:int getDataSectionSize():925:926 -> g
+    1:2:int getDebugInfosOffset():945:946 -> h
+    3:4:void setDebugInfosOffset(int):950:951 -> h
+    1:2:int getEncodedArrarysOffset():1029:1030 -> i
+    3:4:void setEncodedArrarysOffset(int):1034:1035 -> i
+    1:1:int getEndOfFile():1047:1047 -> j
+    2:2:void setEndOfFile(int):1051:1051 -> j
+    1:1:int getMapOffset():1039:1039 -> k
+    2:2:void setMapOffset(int):1043:1043 -> k
+    1:2:int getStringDataOffsets():965:966 -> l
+    3:4:void setStringDataOffsets(int):970:971 -> l
+    1:2:int getTypeListsOffset():955:956 -> m
+    3:4:void setTypeListsOffset(int):960:961 -> m
 com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.dex.t:
     boolean $assertionsDisabled -> n
     int minApiLevel -> m
@@ -14209,73 +14247,72 @@
     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>():1063:1063 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1063:1063 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1099:1099 -> <init>
-    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1070:1101 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1063:1063 -> a
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1088:1089 -> a
-    4:5:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1105:1106 -> a
-    6:6:boolean add(com.android.tools.r8.graph.DexProgramClass):1122:1122 -> a
-    7:7:boolean add(com.android.tools.r8.graph.DexEncodedArray):1127:1127 -> a
-    8:11:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1134:1137 -> a
-    12:12:void visit(com.android.tools.r8.graph.DexEncodedMethod):1142:1142 -> a
-    13:13:boolean add(com.android.tools.r8.graph.DexCode):1147:1147 -> a
-    14:15:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
-    14:15:boolean add(com.android.tools.r8.graph.DexCode):1147 -> a
-    16:16:boolean add(com.android.tools.r8.graph.DexDebugInfo):1152:1152 -> a
-    17:20:boolean add(com.android.tools.r8.graph.DexTypeList):1157:1160 -> a
-    21:24:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1165:1168 -> a
-    25:25:boolean add(com.android.tools.r8.graph.DexAnnotation):1173:1173 -> a
-    26:28:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1179:1181 -> a
-    29:29:boolean add(com.android.tools.r8.graph.DexString):1185:1185 -> a
-    30:31:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
-    30:31:boolean add(com.android.tools.r8.graph.DexString):1185 -> a
-    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1232:1233 -> a
-    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1241:1242 -> a
-    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1304:1305 -> a
-    38:38:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1314:1314 -> a
-    39:39:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1318:1318 -> a
-    40:41:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    40:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1318 -> a
-    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1322:1323 -> a
-    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327:1327 -> a
-    45:46:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    45:46:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327 -> a
-    47:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1331:1331 -> a
-    48:49:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1337:1338 -> a
-    50:50:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1342:1342 -> a
-    51:51:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1346:1346 -> a
-    52:52:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1350:1350 -> a
-    53:54:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1354:1355 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1094:1095 -> b
-    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1247:1247 -> b
-    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1251:1254 -> b
-    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1258:1258 -> b
-    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1262:1262 -> b
-    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1266:1266 -> b
-    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1280:1280 -> b
-    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1286:1289 -> b
-    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1293:1296 -> b
-    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1300:1300 -> b
-    1:1:java.util.Collection getAnnotationDirectories():1221:1221 -> c
-    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1271:1275 -> c
-    1:1:java.util.Collection getAnnotationSetRefLists():1213:1213 -> d
-    1:1:java.util.Collection getAnnotationSets():1209:1209 -> e
-    1:1:java.util.Collection getAnnotations():1205:1205 -> f
-    1:1:java.util.Collection getClassesWithData():1217:1217 -> g
-    1:1:java.util.Collection getCodes():1189:1189 -> h
-    1:1:java.util.Collection getDebugInfos():1193:1193 -> i
-    1:1:java.util.Collection getEncodedArrays():1225:1225 -> j
-    1:1:java.util.Collection getStringData():1201:1201 -> k
-    1:1:java.util.Collection getTypeLists():1197:1197 -> l
+    1:1:void <clinit>():1062:1062 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.dex.FileWriter$1):1062:1062 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1098:1098 -> <init>
+    3:34:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.MethodToCodeObjectMapping):1069:1100 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$100(com.android.tools.r8.dex.FileWriter$MixedSectionOffsets):1062:1062 -> a
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap createObject2IntMap():1087:1088 -> a
+    4:5:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,java.lang.Object):1104:1105 -> a
+    6:6:boolean add(com.android.tools.r8.graph.DexProgramClass):1121:1121 -> a
+    7:7:boolean add(com.android.tools.r8.graph.DexEncodedArray):1126:1126 -> a
+    8:11:boolean add(com.android.tools.r8.graph.DexAnnotationSet):1133:1136 -> a
+    12:12:void visit(com.android.tools.r8.graph.DexEncodedMethod):1141:1141 -> a
+    13:13:boolean add(com.android.tools.r8.graph.DexCode):1146:1146 -> a
+    14:15:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1112:1113 -> a
+    14:15:boolean add(com.android.tools.r8.graph.DexCode):1146 -> a
+    16:16:boolean add(com.android.tools.r8.graph.DexDebugInfo):1151:1151 -> a
+    17:20:boolean add(com.android.tools.r8.graph.DexTypeList):1156:1159 -> a
+    21:24:boolean add(com.android.tools.r8.graph.ParameterAnnotationsList):1164:1167 -> a
+    25:25:boolean add(com.android.tools.r8.graph.DexAnnotation):1172:1172 -> a
+    26:28:boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory):1178:1180 -> a
+    29:29:boolean add(com.android.tools.r8.graph.DexString):1184:1184 -> a
+    30:31:boolean add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1112:1113 -> a
+    30:31:boolean add(com.android.tools.r8.graph.DexString):1184 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1231:1232 -> a
+    34:35:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1240:1241 -> a
+    36:37:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1303:1304 -> a
+    38:38:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfo,int):1313:1313 -> a
+    39:39:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1317:1317 -> a
+    40:41:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1308:1309 -> a
+    40:41:void setOffsetFor(com.android.tools.r8.graph.DexCode,int):1317 -> a
+    42:43:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1321:1322 -> a
+    44:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1326:1326 -> a
+    45:46:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1308:1309 -> a
+    45:46:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1326 -> a
+    47:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1330:1330 -> a
+    48:49:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1336:1337 -> a
+    50:50:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1341:1341 -> a
+    51:51:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1345:1345 -> a
+    52:52:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1349:1349 -> a
+    53:54:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1353:1354 -> a
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1093:1094 -> b
+    3:3:int getOffsetFor(com.android.tools.r8.graph.DexString):1246:1246 -> b
+    4:7:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1250:1253 -> b
+    8:8:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1257:1257 -> b
+    9:9:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1261:1261 -> b
+    10:10:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfo):1265:1265 -> b
+    11:11:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1279:1279 -> b
+    12:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1285:1288 -> b
+    16:19:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1292:1295 -> b
+    20:20:int getOffsetFor(com.android.tools.r8.graph.DexCode):1299:1299 -> b
+    1:1:java.util.Collection getAnnotationDirectories():1220:1220 -> c
+    2:6:int getOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexProgramClass):1270:1274 -> c
+    1:1:java.util.Collection getAnnotationSetRefLists():1212:1212 -> d
+    1:1:java.util.Collection getAnnotationSets():1208:1208 -> e
+    1:1:java.util.Collection getAnnotations():1204:1204 -> f
+    1:1:java.util.Collection getClassesWithData():1216:1216 -> g
+    1:1:java.util.Collection getCodes():1188:1188 -> h
+    1:1:java.util.Collection getDebugInfos():1192:1192 -> i
+    1:1:java.util.Collection getEncodedArrays():1224:1224 -> j
+    1:1:java.util.Collection getStringData():1200:1200 -> k
+    1:1:java.util.Collection getTypeLists():1196:1196 -> 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[]):1363:1364 -> <init>
-    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1361:1365 -> <init>
-    void visit(com.android.tools.r8.graph.DexType) -> b
-    1:4:void visit(com.android.tools.r8.graph.DexClass):1376:1379 -> b
+    1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1362:1363 -> <init>
+    3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1360:1364 -> <init>
+    1:4:void visit(com.android.tools.r8.graph.DexClass):1375:1378 -> b
 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
@@ -14323,7 +14360,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):452 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):455:458 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):447:447 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):448 -> a
     109:109:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):448:448 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14369,7 +14406,7 @@
     107:107:void markDexFull(com.android.tools.r8.dex.VirtualFile):721:721 -> b
     107:107:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648 -> b
     108:108:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):642:642 -> b
-    109:109:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> b
+    109:109:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> b
     109:109:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643 -> b
     110:110:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643:643 -> b
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -14518,10 +14555,7 @@
     1:1:void <init>(com.android.tools.r8.dex.Marker$Tool):54:54 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.com.google.gson.JsonObject):57:59 -> <init>
     1:12:void checkCompatibleDesugaredLibrary(java.util.Set,com.android.tools.r8.utils.Reporter):63:74 -> a
-    13:27:void checkCompatibleDesugaredLibrary(java.util.Set,com.android.tools.r8.utils.Reporter):73:87 -> a
-    28:30:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    28:30:void checkCompatibleDesugaredLibrary(java.util.Set,com.android.tools.r8.utils.Reporter):87 -> a
-    31:36:void checkCompatibleDesugaredLibrary(java.util.Set,com.android.tools.r8.utils.Reporter):91:96 -> a
+    13:36:void checkCompatibleDesugaredLibrary(java.util.Set,com.android.tools.r8.utils.Reporter):73:96 -> a
     37:37:boolean lambda$checkCompatibleDesugaredLibrary$0(com.android.tools.r8.dex.Marker):74:74 -> a
     38:39:com.android.tools.r8.dex.Marker setMinApi(long):139:140 -> a
     40:45:com.android.tools.r8.dex.Marker setDesugaredLibraryIdentifiers(java.lang.String[]):157:162 -> a
@@ -14609,8 +14643,8 @@
     15:23:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):60:68 -> a
     24:33:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):122:122 -> a
     24:33:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
-    41:45:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):130:134 -> a
-    41:45:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
+    45:45:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):134:134 -> a
+    45:45:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
     46:48:byte[] adaptFileContents(com.android.tools.r8.DataEntryResource):131:131 -> a
     46:48:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):69 -> a
     49:53:com.android.tools.r8.DataEntryResource adaptIfNeeded(com.android.tools.r8.DataEntryResource):76:80 -> a
@@ -14805,14 +14839,12 @@
     734:735:boolean isFull(int):206:207 -> a
     736:736:boolean isFull():211:211 -> a
     736:736:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):223 -> a
-    737:739:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):226:228 -> a
-    740:742:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    740:742:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):226 -> a
-    743:743:boolean isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):232:232 -> a
-    743:743:boolean access$1500(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):52 -> a
-    744:744:void abortTransaction():236:236 -> a
-    745:745:boolean containsString(com.android.tools.r8.graph.DexString):244:244 -> a
-    746:746:boolean containsType(com.android.tools.r8.graph.DexType):248:248 -> a
+    737:740:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):226:226 -> a
+    741:741:boolean isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):232:232 -> a
+    741:741:boolean access$1500(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):52 -> a
+    742:742:void abortTransaction():236:236 -> a
+    743:743:boolean containsString(com.android.tools.r8.graph.DexString):244:244 -> a
+    744:744:boolean containsType(com.android.tools.r8.graph.DexType):248:248 -> a
     1:1:int access$1200(com.android.tools.r8.dex.VirtualFile):52:52 -> b
     2:2:void injectString(com.android.tools.r8.graph.DexString):153:153 -> b
     3:3:void commitTransaction():240:240 -> b
@@ -14873,7 +14905,12 @@
     42:45:java.util.List run():482 -> a
     46:95:java.util.List run():483:532 -> a
     1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):531:531 -> b
-com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.dex.P$f:
+com.android.tools.r8.dex.VirtualFile$FillStrategy -> com.android.tools.r8.dex.P$f:
+    com.android.tools.r8.dex.VirtualFile$FillStrategy FILL_MAX -> a
+    com.android.tools.r8.dex.VirtualFile$FillStrategy LEAVE_SPACE_FOR_GROWTH -> b
+    1:4:void <clinit>():57:60 -> <clinit>
+    1:1:void <init>(java.lang.String,int):55:55 -> <init>
+com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.dex.P$g:
     java.util.Set types -> g
     java.util.Set protos -> h
     java.util.Set strings -> i
@@ -14912,13 +14949,13 @@
     1:1:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):735:735 -> getRenamedDescriptor
     1:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):740:741 -> getRenamedName
     3:3:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):746:746 -> getRenamedName
-com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.dex.P$g:
+com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.dex.P$h:
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):538:538 -> <init>
     1:9:java.util.List run():544:552 -> a
     10:10:void com.android.tools.r8.dex.VirtualFile$DistributorBase.addFeatureSplitFiles(java.util.Map):431:431 -> a
     10:10:java.util.List run():554 -> a
     11:11:java.util.List run():557:557 -> a
-com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.dex.P$h:
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.dex.P$i:
     java.util.List classes -> a
     java.util.Map originalNames -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -14960,7 +14997,7 @@
     152:152:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1081 -> a
     153:153:com.android.tools.r8.dex.VirtualFile getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1082:1082 -> a
     1:1:java.lang.Object call():904:904 -> call
-com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.dex.P$i:
+com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.dex.P$j:
     java.util.List files -> a
     java.util.Iterator activeFiles -> f
     java.util.Iterator allFilesCyclic -> e
@@ -14982,7 +15019,7 @@
     1:1:com.android.tools.r8.dex.VirtualFile next():844:844 -> c
     1:2:void reset():835:836 -> d
     1:1:void restart():882:882 -> e
-com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.dex.P$j:
+com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.dex.P$k:
     java.util.Set fields -> g
     java.util.Set strings -> h
     java.util.Set callSites -> i
@@ -15021,45 +15058,42 @@
     1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):561:561 -> h
 com.android.tools.r8.dexsplitter.DexSplitter -> com.android.tools.r8.dexsplitter.DexSplitter:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>():37:37 -> <init>
-    1:6:com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar parseFeatureJarArgument(java.lang.String):201:206 -> a
-    1:6:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):222 -> a
-    7:11:com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar parseFeatureJarArgument(java.lang.String):204:208 -> a
-    7:11:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):222 -> a
-    12:12:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):222:222 -> a
-    13:14:void run(java.lang.String[]):280:281 -> a
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>():38:38 -> <init>
+    1:6:com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar parseFeatureJarArgument(java.lang.String):204:209 -> a
+    1:6:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):225 -> a
+    7:11:com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar parseFeatureJarArgument(java.lang.String):207:211 -> a
+    7:11:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):225 -> a
+    12:12:void lambda$parseArguments$0(com.android.tools.r8.dexsplitter.DexSplitter$Options,java.lang.String):225:225 -> a
+    13:14:void run(java.lang.String[]):283:284 -> a
     13:14:void lambda$main$1(java.lang.String[]):362 -> a
     15:16:void lambda$main$1(java.lang.String[]):365:366 -> a
-    17:17:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):347:347 -> a
-    1:51:com.android.tools.r8.dexsplitter.DexSplitter$Options parseArguments(java.lang.String[]):212:262 -> b
+    1:51:com.android.tools.r8.dexsplitter.DexSplitter$Options parseArguments(java.lang.String[]):215:265 -> b
     1:1:void main(java.lang.String[]):359:359 -> main
-    1:27:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):287:313 -> run
-    28:30:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):269:271 -> run
-    28:30:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
-    31:36:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):270:275 -> run
-    31:36:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
-    37:37:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):274:274 -> run
-    37:37:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
-    38:38:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):319:319 -> run
-    39:42:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):318:321 -> run
-    43:59:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):328:344 -> run
-    43:59:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
-    60:70:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):337:347 -> run
-    60:70:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
-    71:91:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):329:349 -> run
-    71:91:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
-    92:94:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):348:350 -> run
-    92:94:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
-    95:95:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
+    1:24:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):290:313 -> run
+    25:27:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):272:274 -> run
+    25:27:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
+    28:33:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):273:278 -> run
+    28:33:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
+    34:34:com.android.tools.r8.utils.FeatureClassMapping createFeatureClassMapping(com.android.tools.r8.dexsplitter.DexSplitter$Options):277:277 -> run
+    34:34:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):316 -> run
+    35:35:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):319:319 -> run
+    36:39:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):318:321 -> run
+    40:56:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):328:344 -> run
+    40:56:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
+    57:67:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):337:347 -> run
+    57:67:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
+    68:89:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):329:350 -> run
+    68:89:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
+    90:90:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
 com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.dexsplitter.DexSplitter$a:
     java.lang.String jar -> a
     java.lang.String outputName -> b
-    1:3:void <init>(java.lang.String,java.lang.String):48:50 -> <init>
-    4:4:void <init>(java.lang.String):54:54 -> <init>
-    1:1:java.lang.String getJar():58:58 -> a
-    2:5:java.lang.String featureNameFromJar(java.lang.String):66:69 -> a
-    1:1:java.lang.String getOutputName():62:62 -> b
+    1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
+    4:4:void <init>(java.lang.String):55:55 -> <init>
+    1:1:java.lang.String getJar():59:59 -> a
+    2:5:java.lang.String featureNameFromJar(java.lang.String):67:70 -> a
+    1:1:java.lang.String getOutputName():63:63 -> b
 com.android.tools.r8.dexsplitter.DexSplitter$Options -> com.android.tools.r8.dexsplitter.DexSplitter$Options:
     java.util.List inputArchives -> b
     java.lang.String featureSplitMapping -> g
@@ -15071,51 +15105,80 @@
     java.util.List baseJars -> d
     java.util.List featureJars -> c
     java.lang.String baseOutputName -> e
-    1:1:void <init>():101:101 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):104:104 -> <init>
-    3:18:void <init>(com.android.tools.r8.DiagnosticsHandler):90:105 -> <init>
-    1:1:com.android.tools.r8.DiagnosticsHandler access$000(com.android.tools.r8.dexsplitter.DexSplitter$Options):88:88 -> a
-    2:2:void addFeatureJar(com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):161:161 -> a
-    2:2:void access$300(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):88 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableList getBaseJars():185:185 -> a
-    1:1:void addBaseJar(java.lang.String):157:157 -> addBaseJar
-    1:1:void addFeatureJar(java.lang.String):165:165 -> addFeatureJar
-    2:2:void addFeatureJar(java.lang.String,java.lang.String):169:169 -> addFeatureJar
-    1:1:void addInputArchive(java.lang.String):153:153 -> addInputArchive
-    1:1:java.util.List access$100(com.android.tools.r8.dexsplitter.DexSplitter$Options):88:88 -> b
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList getFeatureJars():181:181 -> b
-    1:1:boolean access$200(com.android.tools.r8.dexsplitter.DexSplitter$Options):88:88 -> c
-    1:1:void error(java.lang.String):190:190 -> error
-    1:1:java.lang.String getBaseOutputName():145:145 -> getBaseOutputName
-    1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():109:109 -> getDiagnosticsHandler
-    1:1:java.lang.String getFeatureSplitMapping():129:129 -> getFeatureSplitMapping
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getInputArchives():177:177 -> getInputArchives
-    1:1:java.lang.String getMainDexList():113:113 -> getMainDexList
-    1:1:java.lang.String getOutput():121:121 -> getOutput
-    1:1:java.lang.String getProguardMap():137:137 -> getProguardMap
-    1:1:void setBaseOutputName(java.lang.String):149:149 -> setBaseOutputName
-    1:1:void setFeatureSplitMapping(java.lang.String):133:133 -> setFeatureSplitMapping
-    1:1:void setMainDexList(java.lang.String):117:117 -> setMainDexList
-    1:1:void setOutput(java.lang.String):125:125 -> setOutput
-    1:1:void setProguardMap(java.lang.String):141:141 -> setProguardMap
-    1:1:void setSplitNonClassResources(boolean):173:173 -> setSplitNonClassResources
+    1:1:void <init>():102:102 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):105:105 -> <init>
+    3:18:void <init>(com.android.tools.r8.DiagnosticsHandler):91:106 -> <init>
+    1:1:com.android.tools.r8.DiagnosticsHandler access$000(com.android.tools.r8.dexsplitter.DexSplitter$Options):89:89 -> a
+    2:2:void addFeatureJar(com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):162:162 -> a
+    2:2:void access$300(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar):89 -> a
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableList getBaseJars():186:186 -> a
+    1:1:void addBaseJar(java.lang.String):158:158 -> addBaseJar
+    1:1:void addFeatureJar(java.lang.String):166:166 -> addFeatureJar
+    2:2:void addFeatureJar(java.lang.String,java.lang.String):170:170 -> addFeatureJar
+    1:1:void addInputArchive(java.lang.String):154:154 -> addInputArchive
+    1:1:java.util.List access$100(com.android.tools.r8.dexsplitter.DexSplitter$Options):89:89 -> b
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableList getFeatureJars():182:182 -> b
+    1:1:boolean access$200(com.android.tools.r8.dexsplitter.DexSplitter$Options):89:89 -> c
+    1:2:com.android.tools.r8.Diagnostic error(java.lang.String):191:192 -> error
+    1:1:java.lang.String getBaseOutputName():146:146 -> getBaseOutputName
+    1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():110:110 -> getDiagnosticsHandler
+    1:1:java.lang.String getFeatureSplitMapping():130:130 -> getFeatureSplitMapping
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getInputArchives():178:178 -> getInputArchives
+    1:1:java.lang.String getMainDexList():114:114 -> getMainDexList
+    1:1:java.lang.String getOutput():122:122 -> getOutput
+    1:1:java.lang.String getProguardMap():138:138 -> getProguardMap
+    1:1:void setBaseOutputName(java.lang.String):150:150 -> setBaseOutputName
+    1:1:void setFeatureSplitMapping(java.lang.String):134:134 -> setFeatureSplitMapping
+    1:1:void setMainDexList(java.lang.String):118:118 -> setMainDexList
+    1:1:void setOutput(java.lang.String):126:126 -> setOutput
+    1:1:void setProguardMap(java.lang.String):142:142 -> setProguardMap
+    1:1:void setSplitNonClassResources(boolean):174:174 -> setSplitNonClassResources
 com.android.tools.r8.dexsplitter.DexSplitter$Options$1 -> com.android.tools.r8.dexsplitter.DexSplitter$Options$a:
-    1:1:void <init>():101:101 -> <init>
+    1:1:void <init>():102:102 -> <init>
 com.android.tools.r8.dexsplitter.DexSplitter$ZipFileOrigin -> com.android.tools.r8.dexsplitter.DexSplitter$b:
-    1:1:void <init>(java.nio.file.Path):78:78 -> <init>
-    1:1:java.lang.String part():83:83 -> part
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.errors.a:
+    1:1:void <init>(java.nio.file.Path):79:79 -> <init>
+    1:1:java.lang.String part():84:84 -> part
+com.android.tools.r8.errors.ApiLevelDiagnostic -> com.android.tools.r8.errors.a:
+    1:1:void <init>():11:11 -> <init>
+    1:1:com.android.tools.r8.origin.Origin getOrigin():15:15 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():20:20 -> getPosition
+com.android.tools.r8.errors.ClassFileOverflowDiagnostic -> com.android.tools.r8.errors.ClassFileOverflowDiagnostic:
+    com.android.tools.r8.origin.Origin origin -> a
+    1:2:void <init>(com.android.tools.r8.origin.Origin):16:17 -> <init>
+    1:1:com.android.tools.r8.origin.Origin getOrigin():22:22 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():27:27 -> getPosition
+com.android.tools.r8.errors.CodeSizeOverflowDiagnostic -> com.android.tools.r8.errors.CodeSizeOverflowDiagnostic:
+    com.android.tools.r8.position.MethodPosition position -> d
+    com.android.tools.r8.references.MethodReference method -> b
+    int codeSize -> c
+    1:4:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.MethodReference,int):24:27 -> <init>
+    1:1:int getCodeSize():32:32 -> getCodeSize
+    1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.errors.b:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:1:void <init>(java.lang.String):22:22 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):26:26 -> <init>
     3:3:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> <init>
-    4:4:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> <init>
-    5:7:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):38:40 -> <init>
-    1:1:com.android.tools.r8.origin.Origin getOrigin():44:44 -> a
-    2:7:com.android.tools.r8.errors.CompilationError withAdditionalOriginAndPositionInfo(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):52:57 -> a
-    1:1:com.android.tools.r8.position.Position getPosition():48:48 -> b
-    1:1:com.android.tools.r8.Diagnostic toStringDiagnostic():64:64 -> c
+    4:4:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> <init>
+    5:7:void <init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):42:44 -> <init>
+    1:1:com.android.tools.r8.origin.Origin getOrigin():48:48 -> a
+    1:1:com.android.tools.r8.position.Position getPosition():52:52 -> b
+    1:1:com.android.tools.r8.Diagnostic toStringDiagnostic():56:56 -> c
+com.android.tools.r8.errors.ConstantPoolOverflowDiagnostic -> com.android.tools.r8.errors.ConstantPoolOverflowDiagnostic:
+    com.android.tools.r8.references.ClassReference clazz -> c
+    int constantPoolSize -> b
+    1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,int):21:23 -> <init>
+    1:1:int getConstantPoolSize():28:28 -> getConstantPoolSize
+    1:5:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.errors.c:
+    com.android.tools.r8.position.MethodPosition position -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
+    1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
 com.android.tools.r8.errors.DexFileOverflowDiagnostic -> com.android.tools.r8.errors.DexFileOverflowDiagnostic:
     long numOfMethods -> b
     long numOfFields -> c
@@ -15153,14 +15216,14 @@
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.errors.b:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.errors.d:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(java.lang.String):18:18 -> <init>
     3:3:void <init>(java.lang.String,java.lang.Throwable):22:22 -> <init>
     4:4:void <init>(java.lang.Throwable):26:26 -> <init>
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.errors.c:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.errors.e:
     1:1:void <init>(java.lang.String):8:8 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.errors.d:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.errors.f:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     java.util.List methods -> b
@@ -15174,6 +15237,9 @@
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.errors.g:
+    1:1:void <init>():9:9 -> <init>
+    1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String):15:15 -> <init>
 com.android.tools.r8.errors.NestDesugarDiagnostic -> com.android.tools.r8.errors.NestDesugarDiagnostic:
@@ -15184,10 +15250,24 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.errors.e:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.errors.h:
+    com.android.tools.r8.position.MethodPosition position -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
+    1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.errors.i:
+    com.android.tools.r8.position.MethodPosition position -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
+    1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.errors.j:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
-com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.errors.f:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.errors.k:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
     3:3:void <init>(java.lang.Throwable):19:19 -> <init>
@@ -15292,7 +15372,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.s.a:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.r.a:
     java.util.List featureSplits -> a
     java.util.Map javaTypeToFeatureSplitMapping -> b
     boolean $assertionsDisabled -> c
@@ -15303,34 +15383,35 @@
     1:8:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.naming.ClassNameMapper):54:61 -> a
     9:9:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):61:61 -> a
     10:25:java.util.Collection getDataResourceProvidersAndConsumers():87:102 -> a
-    26:28:boolean inBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):111:113 -> a
-    29:31:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):117:117 -> a
-    29:31:boolean isInBase(com.android.tools.r8.graph.DexProgramClass):122 -> a
-    32:32:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):126:126 -> a
-    33:39:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):130:136 -> a
-    33:39:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):126 -> a
-    40:43:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):135:138 -> a
-    40:43:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):126 -> a
-    44:44:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):137:137 -> a
-    44:44:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):126 -> a
-    1:3:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):117:117 -> b
-    4:4:java.util.List getFeatureSplits():142:142 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.s.a$a:
+    26:27:boolean inBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):111:112 -> a
+    28:28:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):116:116 -> a
+    29:29:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):124:124 -> a
+    30:35:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128:133 -> a
+    30:35:boolean inSameFeatureOrBase(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):124 -> a
+    36:36:com.android.tools.r8.FeatureSplit getFeatureSplitFromClassDescriptor(java.lang.String):141:141 -> a
+    37:38:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType):145:146 -> a
+    1:1:java.util.List getFeatureSplits():137:137 -> b
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.r.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>
     1:1:com.android.tools.r8.DataResourceConsumer getConsumer():82:82 -> a
     1:1:java.util.Set getProviders():78:78 -> b
 com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.graph.a:
-    1:1:com.android.tools.r8.utils.OptionalBool isMethodAccessible(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):37:37 -> a
-    2:2:com.android.tools.r8.utils.OptionalBool isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):45:45 -> a
-    3:10:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):54:61 -> a
-    11:14:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):80:83 -> a
-    11:14:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):62 -> a
-    15:25:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):63:73 -> a
-    26:26:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> a
-    26:26:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.features.FeatureSplitConfiguration):21 -> a
-    27:35:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.features.FeatureSplitConfiguration):21:29 -> a
+    1:1:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):20:20 -> a
+    2:2:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isMethodAccessible(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):51:51 -> a
+    4:4:com.android.tools.r8.utils.OptionalBool isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):59:59 -> a
+    5:5:com.android.tools.r8.utils.OptionalBool isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):67:67 -> a
+    5:5:com.android.tools.r8.utils.OptionalBool isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):59 -> a
+    6:6:com.android.tools.r8.utils.OptionalBool isFieldAccessible(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):67:67 -> a
+    7:14:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):76:83 -> a
+    15:18:boolean isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):102:105 -> a
+    15:18:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):84 -> a
+    19:29:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):85:95 -> a
+    30:30:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> a
+    30:30:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.features.FeatureSplitConfiguration):27 -> a
+    31:39:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.features.FeatureSplitConfiguration):27:35 -> a
 com.android.tools.r8.graph.AccessFlags -> com.android.tools.r8.graph.b:
     java.util.List NAMES -> c
     int modifiedFlags -> b
@@ -15387,170 +15468,193 @@
     1:1:void unsetPrivate():180:180 -> y
     1:1:void unsetProtected():193:193 -> z
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.c:
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):48:48 -> <init>
-    2:16:void <init>(com.android.tools.r8.graph.DexApplication):36:50 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.AppInfo):53:53 -> <init>
-    18:40:void <init>(com.android.tools.r8.graph.AppInfo):36:58 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.graph.AppInfo):30:30 -> a
-    2:7:java.util.Map computeFieldDefinitions(com.android.tools.r8.graph.DexType):111:116 -> a
-    8:8:void lambda$computeFieldDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):114:114 -> a
-    9:14:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):317:322 -> a
-    15:15: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):375:375 -> a
-    16:22: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):416:422 -> a
-    16:22: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):375 -> a
-    23:24:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):438:439 -> a
-    23: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):429 -> a
-    23: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):375 -> a
-    25:25:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():152:152 -> a
-    25:25:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):439 -> a
-    25:25: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):429 -> a
-    25:25: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):375 -> a
-    26:28:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):439:441 -> a
-    26: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):429 -> a
-    26: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):375 -> a
-    29:29: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):377:377 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> a
-    30:30: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):380 -> a
-    31:40: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):387:396 -> a
-    41:43:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):431:431 -> a
-    44:50:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):440:446 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> a
-    51:51:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):447 -> a
-    52:52:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):471:471 -> a
-    52:52:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):448 -> a
-    53:63:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):450:460 -> a
-    64:67:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult singleResultHelper(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):694:697 -> a
-    64:67:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult access$200(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):30 -> a
-    1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):98:102 -> addSynthesizedClass
-    1:2:com.android.tools.r8.graph.DexApplication app():87:88 -> app
-    1:1:java.util.Map getFieldDefinitions(com.android.tools.r8.graph.DexType):201:201 -> b
-    1:1:boolean checkIfObsolete():82:82 -> checkIfObsolete
-    1:2:java.util.Collection classes():120:121 -> classes
-    1:2:java.lang.Iterable classesWithDeterministicOrder():125:126 -> classesWithDeterministicOrder
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):66:66 -> copyMetadataFromPrevious
-    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):131:139 -> definitionFor
-    10:10:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):144:144 -> definitionFor
-    11:20:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):182:191 -> definitionFor
-    21:22:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):196:197 -> definitionFor
-    1:7:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):158:164 -> definitionForDesugarDependency
-    8:8:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):163:163 -> definitionForDesugarDependency
-    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):171:171 -> definitionForProgramType
-    1:7:com.android.tools.r8.graph.DexClass definitionForWithoutExistenceAssert(com.android.tools.r8.graph.DexType):148:154 -> definitionForWithoutExistenceAssert
-    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():93:94 -> dexItemFactory
-    1:1:boolean hasClassHierarchy():572:572 -> hasClassHierarchy
-    1:1:boolean hasLiveness():582:582 -> hasLiveness
-    1:1:void invalidateFieldCacheFor(com.android.tools.r8.graph.DexType):205:205 -> invalidateFieldCacheFor
-    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):592:593 -> isInMainDexList
-    1:1:boolean isObsolete():70:70 -> isObsolete
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):248:248 -> lookupDirectTargetOnItself
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):253:253 -> lookupDirectTargetOnItself
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):391:391 -> lookupDirectTargetOnItself
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):256 -> lookupDirectTargetOnItself
-    4:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):257:257 -> lookupDirectTargetOnItself
-    1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):416:416 -> lookupMaximallySpecificTarget
-    2:4:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):431:431 -> lookupMaximallySpecificTarget
-    2:4:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):417 -> lookupMaximallySpecificTarget
-    5:5:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):418:418 -> lookupMaximallySpecificTarget
-    6:8:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):423:425 -> lookupMaximallySpecificTarget
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):224:224 -> lookupStaticTargetOnItself
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):229:229 -> lookupStaticTargetOnItself
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):391:391 -> lookupStaticTargetOnItself
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):232 -> lookupStaticTargetOnItself
-    4:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):233:233 -> lookupStaticTargetOnItself
-    1:1:void markObsolete():74:74 -> markObsolete
-    1:1:com.android.tools.r8.utils.InternalOptions options():62:62 -> options
-    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):175:177 -> originFor
-    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):530:531 -> resolveField
-    1:3:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):541:543 -> resolveFieldOn
-    4:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):547:563 -> resolveFieldOn
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):274:282 -> resolveMethod
-    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):286:288 -> resolveMethod
-    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):303:306 -> resolveMethod
-    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):338:350 -> resolveMethodOnClass
-    14:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):354:357 -> resolveMethodOnClass
-    18:18:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:409 -> resolveMethodOnClass
-    18:18:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):362 -> resolveMethodOnClass
-    19:21:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):431:431 -> resolveMethodOnClass
-    19:21:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):410 -> resolveMethodOnClass
-    19:21:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):362 -> resolveMethodOnClass
-    22:22:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnClass
-    22:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):362 -> resolveMethodOnClass
-    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):486:500 -> resolveMethodOnInterface
-    16:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):504:505 -> resolveMethodOnInterface
-    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnInterface
-    18:18:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):507 -> resolveMethodOnInterface
-    19:24:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):509:514 -> resolveMethodOnInterface
-    25:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnInterface
-    25:25:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):516 -> resolveMethodOnInterface
-    26:27:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):517:518 -> resolveMethodOnInterface
-    28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:409 -> resolveMethodOnInterface
-    28:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):522 -> resolveMethodOnInterface
-    29:31:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder):431:431 -> resolveMethodOnInterface
-    29:31:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):410 -> resolveMethodOnInterface
-    29:31:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):522 -> resolveMethodOnInterface
-    32:32:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnInterface
-    32:32:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):522 -> resolveMethodOnInterface
-    1:2:java.util.Collection synthesizedClasses():106:107 -> synthesizedClasses
-    1:2:com.android.tools.r8.graph.DexProgramClass toProgramClass(com.android.tools.r8.graph.DexType):211:212 -> toProgramClass
-    1:1:void unsetObsolete():78:78 -> unsetObsolete
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():577:577 -> withClassHierarchy
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():587:587 -> withLiveness
-com.android.tools.r8.graph.AppInfo$1 -> com.android.tools.r8.graph.c$a:
-com.android.tools.r8.graph.AppInfo$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.c$b:
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):36:36 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo):41:41 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):46:46 -> <init>
+    4:9:void <init>(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ConcurrentHashMap,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.BooleanBox):57:62 -> <init>
+    1:6:java.util.Map computeFieldDefinitions(com.android.tools.r8.graph.DexType):115:120 -> a
+    7:7:void lambda$computeFieldDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):118:118 -> a
+    1:5:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):102:106 -> addSynthesizedClass
+    1:2:com.android.tools.r8.graph.DexApplication app():91:92 -> app
+    1:1:java.util.Map getFieldDefinitions(com.android.tools.r8.graph.DexType):205:205 -> b
+    1:1:boolean checkIfObsolete():86:86 -> checkIfObsolete
+    1:2:java.util.Collection classes():124:125 -> classes
+    1:2:java.lang.Iterable classesWithDeterministicOrder():129:130 -> classesWithDeterministicOrder
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):70:70 -> copyMetadataFromPrevious
+    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):135:143 -> definitionFor
+    10:10:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):148:148 -> definitionFor
+    11:20:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):186:195 -> definitionFor
+    21:22:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):200:201 -> definitionFor
+    1:7:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):162:168 -> definitionForDesugarDependency
+    8:8:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):167:167 -> definitionForDesugarDependency
+    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):175:175 -> definitionForProgramType
+    1:7:com.android.tools.r8.graph.DexClass definitionForWithoutExistenceAssert(com.android.tools.r8.graph.DexType):152:158 -> definitionForWithoutExistenceAssert
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():97:98 -> dexItemFactory
+    1:1:boolean hasClassHierarchy():251:251 -> hasClassHierarchy
+    1:1:boolean hasLiveness():261:261 -> hasLiveness
+    1:1:void invalidateFieldCacheFor(com.android.tools.r8.graph.DexType):209:209 -> invalidateFieldCacheFor
+    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):271:272 -> isInMainDexList
+    1:1:boolean isObsolete():74:74 -> isObsolete
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):240:243 -> lookupDirectTargetOnItself
+    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):391:391 -> lookupDirectTargetOnItself
+    5:5:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):243 -> lookupDirectTargetOnItself
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):244:244 -> lookupDirectTargetOnItself
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):221:224 -> lookupStaticTargetOnItself
+    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):391:391 -> lookupStaticTargetOnItself
+    5:5:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):224 -> lookupStaticTargetOnItself
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):225:225 -> lookupStaticTargetOnItself
+    1:1:void markObsolete():78:78 -> markObsolete
+    1:1:com.android.tools.r8.utils.InternalOptions options():66:66 -> options
+    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):179:181 -> originFor
+    1:1:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):276:276 -> resolveField
+    1:1:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):281:281 -> resolveFieldOn
+    2:2:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():12:12 -> resolveFieldOn
+    2:2:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):282 -> resolveFieldOn
+    3:6:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):284:287 -> resolveFieldOn
+    7:7:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.unknown():16:16 -> resolveFieldOn
+    7:7:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):288 -> resolveFieldOn
+    1:2:java.util.Collection synthesizedClasses():110:111 -> synthesizedClasses
+    1:1:void unsetObsolete():82:82 -> unsetObsolete
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():256:256 -> withClassHierarchy
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():266:266 -> withLiveness
+com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.d:
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):42:42 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo):47:47 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):52:52 -> <init>
+    1:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy createForDesugaring(com.android.tools.r8.graph.AppInfo):56:57 -> a
+    3:4:com.android.tools.r8.utils.TraversalContinuation lambda$forEachSuperType$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.lang.Boolean):153:154 -> a
+    5:5:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.Boolean):191:191 -> a
+    6:7:void lambda$implementedInterfaces$2(java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Boolean):229:230 -> a
+    8:12:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):284:288 -> a
+    13:25:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):286:298 -> a
+    26:31:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):504:509 -> a
+    32:32: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):566:566 -> a
+    33:39: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):421:427 -> a
+    33:39: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):566 -> a
+    40:41:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):443:444 -> a
+    40:41: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):434 -> a
+    40:41: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):566 -> a
+    42:42:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():152:152 -> a
+    42:42:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):444 -> a
+    42:42: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):434 -> a
+    42:42: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):566 -> a
+    43:45:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):444:446 -> a
+    43:45: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):434 -> a
+    43:45: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):566 -> a
+    46:46: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):568:568 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> a
+    47:47: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):571 -> a
+    48:57: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):578:587 -> a
+    58:60:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):622:622 -> a
+    61:67:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):631:637 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> a
+    68:68:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):638 -> a
+    69:69:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):662:662 -> a
+    69:69:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):639 -> a
+    70:80:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):641:651 -> a
+    81:98:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):758:775 -> a
+    99:99:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():12:12 -> a
+    99:99:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set):778 -> a
+    100:102:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):783:785 -> a
+    103:103:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):801:801 -> a
+    103:103:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):788 -> a
+    104:132:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClassAndField.create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):0:28 -> a
+    104:132:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):803 -> a
+    104:132:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):788 -> a
+    133:133:com.android.tools.r8.graph.DexClassAndField resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):806:806 -> a
+    133:133:com.android.tools.r8.graph.DexClassAndField resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):788 -> a
+    1:14:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):246:259 -> computeProgramClassRelationChain
+    15:23:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):268:276 -> computeProgramClassRelationChain
+    15:23:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):259 -> computeProgramClassRelationChain
+    24:27:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):260:263 -> computeProgramClassRelationChain
+    1:1:void forEachSuperType(com.android.tools.r8.graph.DexClass,java.util.function.BiConsumer):150:150 -> forEachSuperType
+    1:1:boolean hasClassHierarchy():62:62 -> hasClassHierarchy
+    1:17:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):212:228 -> implementedInterfaces
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):202:202 -> inDifferentHierarchy
+    1:3:boolean inSameHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):196:198 -> inSameHierarchy
+    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):237:237 -> isExternalizable
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):206:206 -> isMissingOrHasMissingSuperType
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):572:576 -> isMissingOrHasMissingSuperType
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):207 -> isMissingOrHasMissingSuperType
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):241:241 -> isSerializable
+    1:26:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:192 -> isStrictSubtypeOf
+    1:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):159:163 -> isSubtype
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):434:435 -> lookupDirectTarget
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):440:440 -> lookupDirectTarget
+    1:1:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):363:363 -> lookupInstanceTarget
+    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):356:359 -> lookupInstanceTargetOn
+    1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):341:341 -> lookupMaximallySpecificMethod
+    2:2:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):346:346 -> lookupMaximallySpecificMethod
+    1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):607:607 -> lookupMaximallySpecificTarget
+    2:4:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):622:622 -> lookupMaximallySpecificTarget
+    2:4:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):608 -> lookupMaximallySpecificTarget
+    5:5:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):609:609 -> lookupMaximallySpecificTarget
+    6:8:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):614:616 -> lookupMaximallySpecificTarget
+    1:1:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexField):380:380 -> lookupStaticTarget
+    2:3:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):394:395 -> lookupStaticTarget
+    4:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):400:400 -> lookupStaticTarget
+    1:4:com.android.tools.r8.graph.DexEncodedField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):373:376 -> lookupStaticTargetOn
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):415:416 -> lookupSuperTarget
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):421:421 -> lookupSuperTarget
+    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):317:323 -> methodDefinedInInterface
+    8:8:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):118:118 -> methodDefinedInInterface
+    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):323 -> methodDefinedInInterface
+    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):323:329 -> methodDefinedInInterface
+    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):304:309 -> methodDefinedInInterfaces
+    1:2:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):725:726 -> resolveField
+    1:1:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):732:732 -> resolveFieldOn
+    2:4:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):742:744 -> resolveFieldOn
+    5:5:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult com.android.tools.r8.graph.FieldResolutionResult.failure():12:12 -> resolveFieldOn
+    5:5:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):744 -> resolveFieldOn
+    6:8:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):748:750 -> resolveFieldOn
+    1:2:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):468:469 -> resolveMethod
+    1:3:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):473:475 -> resolveMethodOn
+    4:7:com.android.tools.r8.graph.ResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):490:493 -> resolveMethodOn
+    1:1:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):514:514 -> resolveMethodOnClass
+    2:14:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):529:541 -> resolveMethodOnClass
+    15:18:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):545:548 -> resolveMethodOnClass
+    19:19:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):600:600 -> resolveMethodOnClass
+    19:19:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):553 -> resolveMethodOnClass
+    20:22:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):622:622 -> resolveMethodOnClass
+    20:22:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):601 -> resolveMethodOnClass
+    20:22:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):553 -> resolveMethodOnClass
+    23:23:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):602:602 -> resolveMethodOnClass
+    23:23:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):553 -> resolveMethodOnClass
+    1:1:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):666:666 -> resolveMethodOnInterface
+    2:16:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):681:695 -> resolveMethodOnInterface
+    17:18:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):699:700 -> resolveMethodOnInterface
+    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnInterface
+    19:19:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):702 -> resolveMethodOnInterface
+    20:25:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):704:709 -> resolveMethodOnInterface
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> resolveMethodOnInterface
+    26:26:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):711 -> resolveMethodOnInterface
+    27:28:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):712:713 -> resolveMethodOnInterface
+    29:29:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):600:600 -> resolveMethodOnInterface
+    29:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):717 -> resolveMethodOnInterface
+    30:32:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):622:622 -> resolveMethodOnInterface
+    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):601 -> resolveMethodOnInterface
+    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):717 -> resolveMethodOnInterface
+    33:33:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):602:602 -> resolveMethodOnInterface
+    33:33:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):717 -> resolveMethodOnInterface
+    1:53:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction):89:141 -> traverseSuperTypes
+    1:10:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):454:463 -> unsafeResolveMethodDueToDexFormat
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():68:68 -> withClassHierarchy
+com.android.tools.r8.graph.AppInfoWithClassHierarchy$1 -> com.android.tools.r8.graph.d$a:
+com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder -> com.android.tools.r8.graph.d$b:
     java.util.LinkedHashMap maximallySpecificMethods -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():596:596 -> <clinit>
-    1:9:void <init>():596:604 -> <init>
-    10:10:void <init>(com.android.tools.r8.graph.AppInfo$1):596:596 -> <init>
-    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):608:616 -> a
-    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):624:638 -> a
-    25:27:com.android.tools.r8.graph.DexClassAndMethod lookup():643:645 -> a
-    28:34:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):655:661 -> a
-    35:63:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):660:688 -> a
-    1:2:com.android.tools.r8.graph.ResolutionResult resolve(com.android.tools.r8.graph.DexClass):650:651 -> b
-com.android.tools.r8.graph.AppInfoWithClassHierarchy -> com.android.tools.r8.graph.d:
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):30:30 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo):34:34 -> <init>
-    1:2:com.android.tools.r8.utils.TraversalContinuation lambda$forEachSuperType$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,java.lang.Boolean):130:131 -> a
-    3:3:com.android.tools.r8.utils.TraversalContinuation lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.Boolean):168:168 -> a
-    4:5:void lambda$implementedInterfaces$2(java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Boolean):206:207 -> a
-    6:10:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):261:265 -> a
-    11:23:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):263:275 -> a
-    1:14:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):223:236 -> computeProgramClassRelationChain
-    15:23:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):245:253 -> computeProgramClassRelationChain
-    15:23:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):236 -> computeProgramClassRelationChain
-    24:27:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):237:240 -> computeProgramClassRelationChain
-    1:1:void forEachSuperType(com.android.tools.r8.graph.DexClass,java.util.function.BiConsumer):127:127 -> forEachSuperType
-    1:1:boolean hasClassHierarchy():39:39 -> hasClassHierarchy
-    1:17:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):189:205 -> implementedInterfaces
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:179 -> inDifferentHierarchy
-    1:3:boolean inSameHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):173:175 -> inSameHierarchy
-    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):214:214 -> isExternalizable
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):183:183 -> isMissingOrHasMissingSuperType
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):567:571 -> isMissingOrHasMissingSuperType
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):184 -> isMissingOrHasMissingSuperType
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):218:218 -> isSerializable
-    1:26:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):144:169 -> isStrictSubtypeOf
-    1:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):136:140 -> isSubtype
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):405:406 -> lookupDirectTarget
-    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):410:411 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):333:336 -> lookupInstanceTarget
-    1:1:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):318:318 -> lookupMaximallySpecificMethod
-    2:2:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):323:323 -> lookupMaximallySpecificMethod
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):346:349 -> lookupStaticTarget
-    5:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):363:364 -> lookupStaticTarget
-    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):369:370 -> lookupStaticTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):385:386 -> lookupSuperTarget
-    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):391:392 -> lookupSuperTarget
-    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):294:300 -> methodDefinedInInterface
-    8:8:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):117:117 -> methodDefinedInInterface
-    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):300 -> methodDefinedInInterface
-    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):300:306 -> methodDefinedInInterface
-    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):281:286 -> methodDefinedInInterfaces
-    1:53:com.android.tools.r8.utils.TraversalContinuation traverseSuperTypes(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction):66:118 -> traverseSuperTypes
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():45:45 -> withClassHierarchy
+    1:1:void <clinit>():809:809 -> <clinit>
+    1:9:void <init>():809:817 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy$1):809:809 -> <init>
+    1:9:void addCandidate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfo):821:829 -> a
+    10:24:void markShadowed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfo):837:851 -> a
+    25:27:com.android.tools.r8.graph.DexClassAndMethod lookup():856:858 -> a
+    28:34:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):868:874 -> a
+    35:63:com.android.tools.r8.graph.ResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):873:901 -> a
+    64:67:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult singleResultHelper(com.android.tools.r8.graph.DexClass,java.util.Map$Entry):906:909 -> a
+    1:2:com.android.tools.r8.graph.ResolutionResult resolve(com.android.tools.r8.graph.DexClass):863:864 -> b
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.graph.e:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -15594,94 +15698,113 @@
     1:12:void visit(com.android.tools.r8.DataEntryResource):157:168 -> visit
     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
-    com.android.tools.r8.graph.InitClassLens initClassLens -> f
-    boolean allCodeProcessed -> o
-    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> m
-    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> n
-    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> d
-    boolean $assertionsDisabled -> v
-    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> h
-    com.android.tools.r8.utils.InternalOptions options -> g
-    java.util.Map sourceDebugExtensions -> u
-    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> l
-    com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> k
-    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> s
-    com.android.tools.r8.graph.AppServices appServices -> b
-    com.android.tools.r8.graph.GraphLense graphLense -> e
-    java.util.function.Predicate classesEscapingIntoLibrary -> p
-    com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums -> t
-    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> q
-    com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses -> r
+    com.android.tools.r8.graph.InitClassLens initClassLens -> g
+    java.util.Set cfByteCodePassThrough -> w
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
+    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> e
+    com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums -> v
+    boolean allCodeProcessed -> q
+    boolean $assertionsDisabled -> y
+    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> u
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring -> b
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> k
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> l
+    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> j
+    com.android.tools.r8.ir.desugar.PrefixRewritingMapper rewritePrefix -> m
+    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> p
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator -> n
+    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> o
+    com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> i
+    java.util.function.Predicate classesEscapingIntoLibrary -> r
+    com.android.tools.r8.utils.InternalOptions options -> h
+    java.util.Map sourceDebugExtensions -> x
+    com.android.tools.r8.graph.AppServices appServices -> c
+    com.android.tools.r8.graph.GraphLense graphLense -> f
+    com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses -> t
+    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> s
     com.android.tools.r8.graph.AppInfo appInfo -> a
-    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> i
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> j
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):77:78 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):72:72 -> <init>
-    4:4: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):85:85 -> <init>
-    5:63: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):48:106 -> <init>
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):116:116 -> a
-    2:2: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):121:121 -> a
-    3:3:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():139:139 -> a
-    4:8:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):151:155 -> a
-    9:9:void setAppServices(com.android.tools.r8.graph.AppServices):179:179 -> a
-    10:10:void setClassesEscapingIntoLibrary(java.util.function.Predicate):188:188 -> a
-    11:11:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):192:192 -> a
-    12:12:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):196:196 -> a
-    13:13:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):221:221 -> a
-    14:15:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):275:276 -> a
-    16:17:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):282:283 -> a
-    18:19:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):324:325 -> a
-    20:20:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):340:340 -> a
-    21:21:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):345:345 -> a
-    22:23:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):365:366 -> a
-    24:24:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):388:388 -> a
-    25:25:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):398:398 -> a
-    26:26:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):406:406 -> a
-    27:29:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):433:435 -> a
-    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):125:125 -> b
-    2:2: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):130:130 -> b
-    3:4:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):183:184 -> b
-    5:6:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):297:298 -> b
-    7:8:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):312:313 -> b
-    9:14:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():370:375 -> b
-    1:1:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):135:135 -> c
-    2:2:com.android.tools.r8.graph.AppInfo appInfo():147:147 -> c
-    3:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):225:228 -> c
-    7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
-    7:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):229 -> c
-    8:12:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):231:235 -> c
-    13:14:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):290:291 -> c
-    15:16:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):304:305 -> c
-    1:1:com.android.tools.r8.graph.AppServices appServices():175:175 -> d
-    2:3:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):261:262 -> d
-    4:5:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):350:351 -> d
-    1:1:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):201:201 -> definitionFor
-    2:2:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):206:206 -> definitionFor
-    3:3:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> definitionFor
-    4:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):216:216 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():240:240 -> dexItemFactory
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():248:248 -> e
-    2:3:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):267:268 -> e
-    1:1:boolean canUseInitClass():332:332 -> f
-    1:1:com.android.tools.r8.graph.GraphLense clearCodeRewritings():171:171 -> g
-    1:1:boolean enableWholeProgramOptimizations():244:244 -> h
-    1:1:com.android.tools.r8.graph.GraphLense graphLense():319:319 -> i
-    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):112:112 -> isModeled
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():336:336 -> j
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():143:143 -> k
-    1:1:boolean isAllCodeProcessed():163:163 -> l
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():252:252 -> m
-    1:1:com.android.tools.r8.utils.InternalOptions options():357:357 -> n
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():256:256 -> o
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():361:361 -> p
-    1:1:void setAllCodeProcessed():167:167 -> q
-    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums():402:402 -> r
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():410:413 -> s
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():394:394 -> t
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():421:421 -> u
-    com.android.tools.r8.graph.AppView withLiveness() -> v
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):83:84 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.utils.InternalOptions):78:78 -> <init>
+    4:4: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):91:91 -> <init>
+    5:67: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):52:114 -> <init>
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):124:124 -> a
+    2:2: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):129:129 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():147:147 -> a
+    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):180:182 -> a
+    7:7:void unsetAppInfoForDesugaring():176:176 -> a
+    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):183 -> a
+    8:8:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):185:185 -> a
+    9:9:void setAppServices(com.android.tools.r8.graph.AppServices):209:209 -> a
+    10:10:void setClassesEscapingIntoLibrary(java.util.function.Predicate):218:218 -> a
+    11:11:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):222:222 -> a
+    12:12:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):226:226 -> a
+    13:13:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):251:251 -> a
+    14:15:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):305:306 -> a
+    16:17:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):312:313 -> a
+    18:19:boolean setGraphLense(com.android.tools.r8.graph.GraphLense):354:355 -> a
+    20:20:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):370:370 -> a
+    21:21:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):375:375 -> a
+    22:22:void setCfByteCodePassThrough(java.util.Set):379:379 -> a
+    23:24:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):399:400 -> a
+    25:25:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):422:422 -> a
+    26:26:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):432:432 -> a
+    27:27:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):440:440 -> a
+    28:30:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):467:469 -> a
+    31:31:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):473:473 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    32:32:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):473 -> a
+    33:37:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):476:480 -> a
+    1:1:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):133:133 -> b
+    2:2: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):138:138 -> b
+    3:4:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):213:214 -> b
+    5:6:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):327:328 -> b
+    7:8:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):342:343 -> b
+    9:14:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():404:409 -> b
+    1:1:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):143:143 -> c
+    2:3:com.android.tools.r8.graph.AppInfo appInfo():159:160 -> c
+    4:7:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):255:258 -> c
+    8:8:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
+    8:8:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):259 -> c
+    9:13:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):261:265 -> c
+    14:15:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):320:321 -> c
+    16:17:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):334:335 -> c
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():164:172 -> d
+    10:11:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):291:292 -> d
+    12:13:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):384:385 -> d
+    1:1:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):231:231 -> definitionFor
+    2:2:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):236:236 -> definitionFor
+    3:3:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> definitionFor
+    4:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):246:246 -> definitionFor
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():270:270 -> dexItemFactory
+    1:1:com.android.tools.r8.graph.AppServices appServices():205:205 -> e
+    2:3:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):297:298 -> e
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():278:278 -> f
+    1:1:boolean canUseInitClass():362:362 -> g
+    1:1:com.android.tools.r8.graph.GraphLense clearCodeRewritings():201:201 -> h
+    1:1:boolean enableWholeProgramOptimizations():274:274 -> i
+    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):120:120 -> isModeled
+    1:1:com.android.tools.r8.graph.GraphLense graphLense():349:349 -> j
+    1:1:boolean hasCfByteCodePassThroughMethods():484:484 -> k
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():366:366 -> l
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():151:151 -> m
+    1:1:boolean isAllCodeProcessed():193:193 -> n
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():282:282 -> o
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory():155:155 -> p
+    1:1:com.android.tools.r8.utils.InternalOptions options():391:391 -> q
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():286:286 -> r
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():395:395 -> s
+    1:1:void setAllCodeProcessed():197:197 -> t
+    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums():436:436 -> u
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():444:447 -> v
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():428:428 -> w
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():455:455 -> x
+    com.android.tools.r8.graph.AppView withLiveness() -> y
+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>():39:40 -> <clinit>
+    1:1:void <init>(java.lang.String,int):38:38 -> <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
@@ -15696,59 +15819,56 @@
     1:4:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):92:95 -> getOriginalMethodSignature
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):82:82 -> getOriginalType
     1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):100:100 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):105:105 -> getRenamedMethodSignature
-    1:1: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):120:120 -> lookupMethod
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):125:125 -> lookupPrototypeChanges
-    1:5:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):110:114 -> lookupType
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense):106:106 -> getRenamedMethodSignature
+    1:1: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):122:122 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):127:127 -> lookupPrototypeChanges
+    1:5:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):112:116 -> lookupType
 com.android.tools.r8.graph.ArgumentUse -> com.android.tools.r8.graph.h:
     1:1:void <init>():7:7 -> <init>
     boolean register(int) -> a
 com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.graph.i:
-    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> g
-    com.android.tools.r8.kotlin.Kotlin kotlin -> h
-    boolean $assertionsDisabled -> j
-    boolean writeAnnotations -> e
-    boolean writeIR -> f
-    boolean writeAllClassInfo -> c
-    com.android.tools.r8.utils.Timing timing -> i
-    boolean writeFields -> d
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean):36:36 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean):32:52 -> <init>
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> c
+    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> h
+    com.android.tools.r8.kotlin.Kotlin kotlin -> i
+    boolean $assertionsDisabled -> k
+    boolean writeFields -> e
+    boolean writeAnnotations -> f
+    boolean writeIR -> g
+    boolean writeAllClassInfo -> d
+    com.android.tools.r8.utils.Timing timing -> j
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean):39:39 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean):27:55 -> <init>
     java.lang.String getFileEnding() -> a
-    1:8:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):94:101 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    9:9:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):102 -> a
-    10:13:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):102:105 -> a
-    14:28:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):116:130 -> a
-    29:30:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):139:140 -> a
-    29:30:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):131 -> a
-    31:31: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):395:395 -> a
-    31:31:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):140 -> a
-    31:31:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):131 -> a
-    32:33:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):143:144 -> a
-    32:33:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):131 -> a
-    34:38:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):141:145 -> a
-    34:38:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):131 -> a
-    39:39:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):133:133 -> a
-    40:54:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):150:164 -> a
-    55:55:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):163:163 -> a
-    56:56:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):160:160 -> a
+    1:8:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):97:104 -> a
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    9:9:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):105 -> a
+    10:13:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):105:108 -> a
+    14:31:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):119:136 -> a
+    32:32:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):150:150 -> a
+    33:33:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):148:148 -> a
+    34:48:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):158:172 -> a
+    49:49:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):171:171 -> a
+    50:50:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):168:168 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
-    1:18:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):63:80 -> c
-    1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):111:111 -> d
-    1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):85:88 -> e
+    1:2:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):142:143 -> b
+    3:3: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):392:392 -> b
+    3:3:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):143 -> b
+    4:13:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):144:153 -> b
+    1:18:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):66:83 -> c
+    1:1:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):114:114 -> d
+    1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):88:91 -> e
 com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.graph.j:
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> g
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):16:17 -> <init>
     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,com.android.tools.r8.graph.SubtypingInfo):26:26 -> a
     3:15:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):49:61 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     16:16:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):61 -> a
     17:18:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):63:64 -> a
     19:19:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
-    19:19:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> a
+    19:19:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():7 -> a
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):35:35 -> b
 com.android.tools.r8.graph.CachedHashValueDexItem -> com.android.tools.r8.graph.k:
     1:1:void <clinit>():9:9 -> <clinit>
@@ -15789,27 +15909,28 @@
     87:87:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):357:357 -> a
     87:87:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):331 -> a
     88:102:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):379:393 -> a
-    103:108:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):407:412 -> a
-    109:120:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):518:529 -> a
-    121:121:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():272:272 -> a
-    121:121:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):530 -> a
-    122:131:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):531:540 -> a
-    132:140:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):538:546 -> a
-    141:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():280:280 -> a
-    141:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):549 -> a
-    142:142:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):549:549 -> a
-    143:167:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):555:579 -> a
-    168:169: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):62:63 -> a
-    168:169:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):579 -> a
-    170:170:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):576:576 -> a
+    103:103:void lambda$registerCodeReferences$0(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):401:401 -> a
+    104:115:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):512:523 -> a
+    116:116:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():260:260 -> a
+    116:116:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):524 -> a
+    117:125:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):525:533 -> a
+    126:132:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):532:538 -> a
+    133:133:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():268:268 -> a
+    133:133:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):541 -> a
+    134:134:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexProgramClass):541:541 -> a
+    135:159:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):547:571 -> a
+    160:161: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):62:63 -> a
+    160:161:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):571 -> a
+    162:162:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):568:568 -> a
     1:1:java.util.List getLocalVariables():146:146 -> b
     2:3:int countNonStackOperations(int):161:162 -> b
+    4:4:void lambda$registerCodeReferencesForDesugaring$1(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):409:409 -> b
     1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):293:293 -> buildIR
     1:3:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):305:307 -> buildInliningIR
     1:1:int getMaxLocals():130:130 -> 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):421:461 -> 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):460:460 -> 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):432:432 -> collectParameterInfo
+    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):416:456 -> 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):455:455 -> 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):427:427 -> collectParameterInfo
     1:1:boolean computeEquals(java.lang.Object):276:276 -> computeEquals
     1:1:int computeHashCode():271:271 -> computeHashCode
     1:1:int getMaxStack():126:126 -> d
@@ -15819,14 +15940,14 @@
     1:1:java.util.List getTryCatchRanges():138:138 -> f
     1:1:void setMaxLocals(int):134:134 -> g
     1:2:boolean isEmptyVoidMethod():281:282 -> isEmptyVoidMethod
-    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):469:497 -> registerArgumentReferences
-    1:1:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):398:398 -> registerCodeReferences
-    1:1:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):403:403 -> registerCodeReferencesForDesugaring
-    1:1:java.lang.String toString():504:504 -> toString
+    1:29:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):464:492 -> registerArgumentReferences
+    1:4:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):398:401 -> registerCodeReferences
+    1:4:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):406:409 -> registerCodeReferencesForDesugaring
+    1:1:java.lang.String toString():499:499 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):123:123 -> toString
-    2:2:java.lang.String toString():504 -> toString
-    3:3:java.lang.String toString():504:504 -> toString
-    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):509:509 -> toString
+    2:2:java.lang.String toString():499 -> toString
+    3:3:java.lang.String toString():499:499 -> toString
+    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):504:504 -> 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
@@ -15954,6 +16075,14 @@
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:3:int hashCode():94:96 -> hashCode
     1:1:java.lang.String toString():103:103 -> toString
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.graph.s$a:
+    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> d
+    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> b
+    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NONE -> a
+    com.android.tools.r8.graph.DebugLocalInfo$PrintLevel FULL -> c
+    1:3:void <clinit>():16:18 -> <clinit>
+    4:4:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(java.lang.String,int):15:15 -> <init>
 com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.graph.t:
     com.android.tools.r8.graph.DefaultInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
@@ -16160,19 +16289,18 @@
     9:11:void ensureParentExists(java.nio.file.Path):31:33 -> a
     9:11:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):43 -> a
     12:12:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):44:44 -> a
-    13:20:void write(com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider,java.util.function.Consumer):66:73 -> a
-    21:23:boolean anyMethodMatches(com.android.tools.r8.graph.DexClass):80:82 -> a
-    24:31:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):86:93 -> a
-    32:32:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):88:88 -> a
-    33:33:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
+    13:21:void write(com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider,java.util.function.Consumer):66:74 -> a
+    22:23:boolean anyMethodMatches(com.android.tools.r8.graph.DexClass):80:81 -> a
+    24:31:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):85:92 -> a
+    32:32:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):87:87 -> a
+    33:33:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.ProgramMethod):90:90 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     void writeMethodsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:2:void write(java.nio.file.Path):49:50 -> b
     3:5:void ensureParentExists(java.nio.file.Path):31:33 -> b
     3:5:void write(java.nio.file.Path):52 -> b
     6:9:void write(java.nio.file.Path):53:53 -> b
-    11:11:void write(java.nio.file.Path):55:55 -> b
-    12:12:void write(java.io.PrintStream):60:60 -> b
+    10:10:void write(java.io.PrintStream):60:60 -> b
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
@@ -16278,34 +16406,34 @@
     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):78:78 -> <init>
     2:66: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):41:105 -> <init>
     67:67: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):95:95 -> <init>
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():721:722 -> A
-    1:1:java.util.List getInnerClasses():695:695 -> B
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():726:727 -> A
+    1:1:java.util.List getInnerClasses():700:700 -> B
     com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo() -> C
     1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():125:125 -> D
-    1:5:com.android.tools.r8.graph.DexType getNestHost():783:787 -> E
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():793:793 -> F
-    1:1:java.util.List getNestMembersClassAttributes():797:797 -> G
-    1:1:com.android.tools.r8.graph.DexType getType():541:541 -> H
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():533:533 -> I
-    1:1:boolean hasClassInitializer():545 -> I
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():563:563 -> J
-    1:1:boolean hasDefaultInitializer():549 -> J
-    1:2:boolean hasStaticSynchronizedMethods():828:829 -> K
+    1:5:com.android.tools.r8.graph.DexType getNestHost():788:792 -> E
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():798:798 -> F
+    1:1:java.util.List getNestMembersClassAttributes():802:802 -> G
+    1:1:com.android.tools.r8.graph.DexType getType():546:546 -> H
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():538:538 -> I
+    1:1:boolean hasClassInitializer():550 -> I
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():568:568 -> J
+    1:1:boolean hasDefaultInitializer():554 -> J
+    1:2:boolean hasStaticSynchronizedMethods():833:834 -> K
     1:5:java.util.List instanceFields():285:289 -> L
-    1:1:boolean isAbstract():456:456 -> M
-    1:1:boolean isAnnotation():460:460 -> N
-    1:4:boolean isAnonymousClass():755:758 -> O
+    1:1:boolean isAbstract():461:461 -> M
+    1:1:boolean isAnnotation():465:465 -> N
+    1:4:boolean isAnonymousClass():760:763 -> O
     boolean isClasspathClass() -> P
-    1:1:boolean isEnum():476:476 -> Q
+    1:1:boolean isEnum():481:481 -> Q
     2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():191:191 -> Q
-    2:2:boolean isEnum():476 -> Q
-    1:1:boolean isInANest():762:762 -> R
-    1:1:boolean isInterface():472:472 -> S
+    2:2:boolean isEnum():481 -> Q
+    1:1:boolean isInANest():767:767 -> R
+    1:1:boolean isInterface():477:477 -> S
     boolean isLibraryClass() -> T
-    1:3:boolean isLocalClass():742:744 -> U
-    1:3:boolean isMemberClass():748:750 -> V
-    1:1:boolean isNestHost():775:775 -> W
-    1:1:boolean isNestMember():779:779 -> X
+    1:3:boolean isLocalClass():747:749 -> U
+    1:3:boolean isMemberClass():753:755 -> V
+    1:1:boolean isNestHost():780:780 -> W
+    1:1:boolean isNestMember():784:784 -> X
     boolean isNotProgramClass() -> Y
     1:1:java.lang.Iterable members():121:121 -> Z
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> Z
@@ -16326,30 +16454,30 @@
     25:25:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):362:362 -> a
     25:25:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):386 -> a
     26:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):391:391 -> a
-    27:28:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):447:448 -> a
+    27:28:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):452:453 -> a
     29:39:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):0:10 -> a
-    29:39:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):448 -> a
-    40:42:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):553:555 -> a
-    43:53:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):613:623 -> a
-    54:56:boolean hasClassInitializerThatCannotBePostponed():637:639 -> a
-    54:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):627 -> a
-    57:57:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():533:533 -> a
-    57:57:boolean hasClassInitializerThatCannotBePostponed():641 -> a
-    57:57:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):627 -> a
-    58:61:boolean hasClassInitializerThatCannotBePostponed():642:645 -> a
-    58:61:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):627 -> a
-    62:65:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):630:633 -> a
-    66:66:boolean hasClassInitializerThatCannotBePostponed():645:645 -> a
-    66:66:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):627 -> a
-    67:67:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):686:686 -> a
+    29:39:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):453 -> a
+    40:42:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):558:560 -> a
+    43:53:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):618:628 -> a
+    54:56:boolean hasClassInitializerThatCannotBePostponed():642:644 -> a
+    54:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):632 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():538:538 -> a
+    57:57:boolean hasClassInitializerThatCannotBePostponed():646 -> a
+    57:57:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):632 -> a
+    58:61:boolean hasClassInitializerThatCannotBePostponed():647:650 -> a
+    58:61:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):632 -> a
+    62:65:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):635:638 -> a
+    66:66:boolean hasClassInitializerThatCannotBePostponed():650:650 -> a
+    66:66:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):632 -> a
+    67:67:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):691:691 -> a
     68:68:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> a
-    68:68:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):686 -> a
-    69:77:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):730:738 -> a
-    78:79:void setNestHost(com.android.tools.r8.graph.DexType):770:771 -> a
-    80:80:boolean isValid(com.android.tools.r8.utils.InternalOptions):819:819 -> a
+    68:68:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):691 -> a
+    69:77:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):735:743 -> a
+    78:79:void setNestHost(com.android.tools.r8.graph.DexType):775:776 -> a
+    80:80:boolean isValid(com.android.tools.r8.utils.InternalOptions):824:824 -> a
     81:85:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):179:183 -> a
-    81:85:boolean isValid(com.android.tools.r8.utils.InternalOptions):819 -> a
-    86:89:boolean isValid(com.android.tools.r8.utils.InternalOptions):820:823 -> a
+    81:85:boolean isValid(com.android.tools.r8.utils.InternalOptions):824 -> a
+    86:89:boolean isValid(com.android.tools.r8.utils.InternalOptions):825:828 -> a
     1:1:java.lang.Iterable methods():129:129 -> a0
     com.android.tools.r8.graph.DexClass asDexClass() -> b
     1:3:java.lang.Iterable fields(java.util.function.Predicate):115:117 -> b
@@ -16358,67 +16486,86 @@
     5:5:void addVirtualMethods(java.util.Collection):170:170 -> b
     6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):174:174 -> b
     7:7:void forEachMethod(java.util.function.Consumer):191:191 -> b
-    8:8:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):70:70 -> b
+    8:8:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> b
     8:8:void forEachMethod(java.util.function.Consumer):191 -> b
     9:11:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):264:266 -> b
     12:14:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> b
     15:15:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):367:367 -> b
     16:16:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> b
-    17:17:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):608:608 -> b
-    18:18:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):607:607 -> b
-    19:25:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):673:679 -> b
-    26:26:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$1(com.android.tools.r8.graph.DexEncodedField):691:691 -> b
+    17:17:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):613:613 -> b
+    18:18:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):612:612 -> b
+    19:25:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):678:684 -> b
+    26:26:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$1(com.android.tools.r8.graph.DexEncodedField):696:696 -> b
     1:5:java.util.List staticFields():227:231 -> b0
-    1:5:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):335:339 -> c
-    6:6:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):362:362 -> c
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):396:396 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> c
-    9:9:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):808:808 -> c
-    10:10:boolean hasInstanceFields():804:804 -> c
-    10:10:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):811 -> c
-    11:11:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):814:814 -> c
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
-    12:12:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):814 -> c
-    13:13:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):815:815 -> c
+    1:10:void appendStaticFields(java.util.Collection):244:253 -> c
+    11:15:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):335:339 -> c
+    16:16:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):362:362 -> c
+    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):396:396 -> c
+    18:18:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> c
+    19:19:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):813:813 -> c
+    20:20:boolean hasInstanceFields():809:809 -> c
+    20:20:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):816 -> c
+    21:21:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):819:819 -> c
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
+    22:22:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):819 -> c
+    23:23:boolean hasInstanceFieldsDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):820:820 -> c
     1:4:boolean verifyNoDuplicateFields():352:355 -> c0
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):138:138 -> collectMixedSectionItems
     1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):154:154 -> d
     2:2:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):406:406 -> d
-    3:3:boolean isFinal():464:464 -> d
-    3:3:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):468 -> d
-    1:1:java.util.List virtualMethods():162:162 -> d0
+    3:3:boolean isFinal():469:469 -> d
+    3:3:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):473 -> d
+    1:1:java.lang.Iterable virtualMethods():162:162 -> d0
     1:1:java.lang.Iterable methods(java.util.function.Predicate):133:133 -> e
-    2:8:boolean isResolvable(com.android.tools.r8.graph.AppView):579:585 -> e
+    2:8:boolean isResolvable(com.android.tools.r8.graph.AppView):584:590 -> e
     9:9:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):0:0 -> e
-    9:9:boolean isResolvable(com.android.tools.r8.graph.AppView):586 -> e
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> e
+    9:9:boolean isResolvable(com.android.tools.r8.graph.AppView):591 -> e
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> e
     10:10:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):296 -> e
-    10:10:boolean isResolvable(com.android.tools.r8.graph.AppView):586 -> e
+    10:10:boolean isResolvable(com.android.tools.r8.graph.AppView):591 -> e
     11:11:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):297:297 -> e
-    11:11:boolean isResolvable(com.android.tools.r8.graph.AppView):586 -> e
-    12:15:boolean isResolvable(com.android.tools.r8.graph.AppView):592:595 -> e
-    1:1:boolean isSerializable(com.android.tools.r8.graph.AppView):599:599 -> f
-    2:3:void removeEnclosingMethod(java.util.function.Predicate):707:708 -> f
-    1:1:void removeInnerClasses(java.util.function.Predicate):717:717 -> g
+    11:11:boolean isResolvable(com.android.tools.r8.graph.AppView):591 -> e
+    12:15:boolean isResolvable(com.android.tools.r8.graph.AppView):597:600 -> e
+    1:1:boolean isSerializable(com.android.tools.r8.graph.AppView):604:604 -> f
+    2:3:void removeEnclosingMethod(java.util.function.Predicate):712:713 -> f
+    1:1:void removeInnerClasses(java.util.function.Predicate):722:722 -> g
     boolean isDexClass() -> h
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):166:166 -> h
     boolean isStaticMember() -> m
-    1:1:com.android.tools.r8.graph.DexReference toReference():483:483 -> n
-    1:3:java.lang.Iterable allImmediateSupertypes():659:661 -> o
-    4:7:java.lang.Iterable allImmediateSupertypes():660:663 -> o
+    1:1:com.android.tools.r8.graph.DexReference toReference():488:488 -> n
+    1:3:java.lang.Iterable allImmediateSupertypes():664:666 -> o
+    4:7:java.lang.Iterable allImmediateSupertypes():665:668 -> o
     1:1:java.util.List allMethodsSorted():195:195 -> p
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> q
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
-    1:1:void clearEnclosingMethod():703:703 -> s
-    1:1:void clearInnerClasses():713:713 -> t
-    1:1:void clearNestHost():766:766 -> u
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():690:691 -> v
-    1:1:java.util.List directMethods():142:142 -> w
+    1:1:void clearEnclosingMethod():708:708 -> s
+    1:1:void clearInnerClasses():718:718 -> t
+    1:1:void clearNestHost():771:771 -> u
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():695:696 -> v
+    1:1:java.lang.Iterable directMethods():142:142 -> w
     1:1:java.lang.Iterable fields():111:111 -> x
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():533:533 -> y
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():699:699 -> z
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():538:538 -> y
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():704:704 -> 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.DexClassAndMethod -> com.android.tools.r8.graph.D:
+com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.D:
+    com.android.tools.r8.graph.DexClass holder -> a
+    com.android.tools.r8.graph.DexEncodedField field -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():10:10 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):15:21 -> <init>
+    com.android.tools.r8.graph.ProgramField asProgramField() -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField getDefinition():41:41 -> b
+    1:1:com.android.tools.r8.graph.DexClass getHolder():33:33 -> c
+    1:1:com.android.tools.r8.graph.DexField getReference():45:45 -> d
+    1:1:boolean equals(java.lang.Object):71:71 -> equals
+    1:1:int hashCode():76:76 -> hashCode
+    1:1:com.android.tools.r8.graph.DexField getReference():45:45 -> toString
+    1:1:java.lang.String toSourceString():61 -> toString
+    1:1:java.lang.String toString():66 -> toString
+    2:2:java.lang.String toSourceString():61:61 -> toString
+    2:2:java.lang.String toString():66 -> toString
+com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.E:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> c
@@ -16438,7 +16585,7 @@
     boolean isProgramMethod() -> k
     1:1:java.lang.String toSourceString():92:92 -> l
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.E:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.F:
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():16:16 -> <clinit>
     1:18:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):36:53 -> <init>
@@ -16449,7 +16596,7 @@
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> collectIndexedItems
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> q
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.F:
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.G:
     com.android.tools.r8.graph.DexCode$Try[] tries -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> i
     boolean $assertionsDisabled -> j
@@ -16488,7 +16635,7 @@
     1:1:java.lang.String toString():272:272 -> toString
     2:67:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):277:342 -> toString
     68:68:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):323:323 -> toString
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.F$a:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.G$a:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -16500,7 +16647,7 @@
     1:9:boolean equals(java.lang.Object):491:499 -> equals
     1:1:int hashCode():483:483 -> hashCode
     1:4:java.lang.String toString():506:509 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.F$b:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.G$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -16511,7 +16658,7 @@
     1:6:boolean equals(java.lang.Object):550:555 -> equals
     1:1:int hashCode():542:542 -> hashCode
     1:16:java.lang.String toString():574:589 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.F$b$a:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.G$b$a:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -16526,7 +16673,7 @@
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):611:611 -> collectMixedSectionItems
     1:3:boolean equals(java.lang.Object):624:626 -> equals
     1:1:int hashCode():616:616 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.graph.G:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.graph.H:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -16541,7 +16688,7 @@
     1:11:void <init>(boolean,int,int,com.android.tools.r8.graph.DexString,boolean,boolean,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):34:44 -> <init>
     1:38:java.lang.String toString(boolean):53:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.H:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.I:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -16586,19 +16733,19 @@
     67:68:void com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry.set(com.android.tools.r8.graph.DebugLocalInfo):29:30 -> a
     67:68:void startArgument(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):139 -> a
     69:72:com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry getEntry(int):206:209 -> a
-com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.H$a:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.H$b:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.I$a:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.I$b:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexDebugEntryBuilder$1):24:24 -> <init>
-com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.I:
+com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.graph.J:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     void accept(com.android.tools.r8.graph.DexDebugEventVisitor) -> a
     void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.I$a:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.graph.J$a:
     int delta -> b
     1:2:void <init>(int):148:149 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):154:155 -> a
@@ -16606,7 +16753,7 @@
     1:1:boolean equals(java.lang.Object):176:176 -> equals
     1:1:int hashCode():170:170 -> hashCode
     1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.I$b:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.graph.J$b:
     int delta -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
@@ -16616,7 +16763,7 @@
     1:1:boolean equals(java.lang.Object):75:75 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.I$c:
+com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.graph.J$c:
     int value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():426:426 -> <clinit>
@@ -16628,7 +16775,7 @@
     1:1:boolean equals(java.lang.Object):468:468 -> equals
     1:1:int hashCode():462:462 -> hashCode
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.I$d:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.graph.J$d:
     int registerNum -> b
     1:2:void <init>(int):272:273 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):278:279 -> a
@@ -16636,7 +16783,7 @@
     1:1:boolean equals(java.lang.Object):300:300 -> equals
     1:1:int hashCode():294:294 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.I$e:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.graph.J$e:
     int registerNum -> b
     1:2:void <init>(int):309:310 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):315:316 -> a
@@ -16644,12 +16791,12 @@
     1:1:boolean equals(java.lang.Object):337:337 -> equals
     1:1:int hashCode():331:331 -> hashCode
     1:1:java.lang.String toString():326:326 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.I$f:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.graph.J$f:
     1:1:void <init>():115:115 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):120:120 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):125:125 -> a
     1:1:boolean equals(java.lang.Object):140:140 -> equals
-com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.I$g:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.graph.J$g:
     com.android.tools.r8.graph.DexString fileName -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):346:347 -> <init>
     1:2:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):352:353 -> a
@@ -16660,7 +16807,7 @@
     1:2:boolean equals(java.lang.Object):380:381 -> equals
     1:2:int hashCode():374:375 -> hashCode
     1:1:java.lang.String toString():369:369 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.I$h:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.graph.J$h:
     com.android.tools.r8.graph.DexMethod callee -> b
     com.android.tools.r8.ir.code.Position caller -> c
     boolean $assertionsDisabled -> d
@@ -16671,12 +16818,12 @@
     1:5:boolean equals(java.lang.Object):418:422 -> equals
     1:1:int hashCode():413:413 -> hashCode
     1:1:java.lang.String toString():408:408 -> toString
-com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.I$i:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.graph.J$i:
     1:1:void <init>():82:82 -> <init>
     1:1:void writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping):87:87 -> a
     2:2:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):92:92 -> a
     1:1:boolean equals(java.lang.Object):108:108 -> equals
-com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.I$j:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.graph.J$j:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -16699,7 +16846,7 @@
     1:14:boolean equals(java.lang.Object):251:264 -> equals
     1:5:int hashCode():242:246 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.J:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.K:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -16754,7 +16901,7 @@
     152:152:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290 -> a
     153:154:void emitLocalChangeEvents(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List,com.android.tools.r8.graph.DexItemFactory):290:291 -> a
     1:4:boolean localsChanged():174:177 -> b
-com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.K:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.L:
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvanceLine) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$AdvancePC) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$Default) -> a
@@ -16765,7 +16912,7 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd) -> a
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
-com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.L:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.M:
     com.android.tools.r8.graph.DexString[] parameters -> b
     com.android.tools.r8.graph.DexDebugEvent[] events -> c
     boolean $assertionsDisabled -> d
@@ -16778,11 +16925,11 @@
     1:9:boolean computeEquals(java.lang.Object):44:52 -> computeEquals
     1:3:int computeHashCode():37:39 -> computeHashCode
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.M:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.N:
     1:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> b
-com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.N:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.O:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -16807,7 +16954,7 @@
     1:1:int getCurrentLine():94:94 -> c
     1:1:com.android.tools.r8.graph.DexMethod getCurrentMethod():102:102 -> d
     1:1:int getCurrentPc():90:90 -> e
-com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.O:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.P:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -16837,11 +16984,11 @@
     boolean isProgramClass() -> l
     boolean isStaticMember() -> m
     com.android.tools.r8.graph.DexReference toReference() -> n
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.P:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.Q:
     1:1:com.android.tools.r8.graph.DexEncodedMember definitionFor(com.android.tools.r8.graph.DexMember):18:18 -> definitionFor
     1:1:com.android.tools.r8.graph.DexClass definitionForHolder(com.android.tools.r8.graph.DexEncodedMember):27:27 -> definitionForHolder
     2:2:com.android.tools.r8.graph.DexClass definitionForHolder(com.android.tools.r8.graph.DexMember):32:32 -> definitionForHolder
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.Q:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.S:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -16869,7 +17016,7 @@
     1:3:boolean equals(java.lang.Object):54:56 -> equals
     1:1:int hashCode():46:46 -> hashCode
     1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.S:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexValue[] values -> a
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):14:15 -> <init>
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):21:21 -> collectIndexedItems
@@ -16877,7 +17024,7 @@
     1:1:boolean equals(java.lang.Object):39:39 -> equals
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.T:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.U:
     com.android.tools.r8.kotlin.KotlinFieldLevelInfo kotlinMemberInfo -> g
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> d
     boolean $assertionsDisabled -> i
@@ -16888,60 +17035,60 @@
     1:2:void <clinit>():24:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):39:39 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):31:42 -> <init>
-    1:2:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):46:47 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    3:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):47 -> a
-    4:4:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):48:48 -> a
-    5:5:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):68:68 -> a
-    6:7:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):76:77 -> a
-    8:10:void setStaticValue(com.android.tools.r8.graph.DexValue):173:175 -> a
-    11:11: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):195:195 -> a
-    12:12:boolean isStatic():135:135 -> a
-    12:12: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):198 -> a
-    13:14: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):198:199 -> a
-    15:15:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():54:54 -> a
-    15:15: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):203 -> a
-    16:26: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):203:213 -> a
-    27:34: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):212:219 -> a
-    35:35:boolean isStatic():135:135 -> a
-    35:35: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):219 -> a
-    36:36: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):220:220 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    37:37: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):220 -> a
-    38: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):221:226 -> a
-    44:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):260:267 -> a
-    52:60:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):272:280 -> a
+    1:2:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    3:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):51 -> a
+    4:4:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
+    5:5:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):72:72 -> a
+    6:7:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):80:81 -> a
+    8:10:void setStaticValue(com.android.tools.r8.graph.DexValue):177:179 -> a
+    11:11: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):199:199 -> a
+    12:12:boolean isStatic():139:139 -> a
+    12:12: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):202 -> a
+    13:14: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):202:203 -> a
+    15:15:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():58:58 -> a
+    15:15: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):207 -> a
+    16:26: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):207:217 -> a
+    27:34: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):216:223 -> a
+    35:35:boolean isStatic():139:139 -> a
+    35:35: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):223 -> a
+    36:36: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):224:224 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    37:37: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):224 -> a
+    38: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):225:230 -> a
+    44:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):264:271 -> a
+    52:60:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):276:284 -> a
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> c
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):83:84 -> collectIndexedItems
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):87:88 -> collectIndexedItems
     3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):83:83 -> collectIndexedItems
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):84 -> collectIndexedItems
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):85:86 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):92:92 -> collectMixedSectionItems
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):88 -> collectIndexedItems
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):89:90 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):96:96 -> collectMixedSectionItems
     boolean isDexEncodedField() -> i
-    1:1:boolean isStatic():135:135 -> m
-    1:1:boolean isStaticMember():156 -> m
-    1:1:com.android.tools.r8.graph.DexField toReference():112:112 -> n
+    1:1:boolean isStatic():139:139 -> m
+    1:1:boolean isStaticMember():160 -> m
+    1:1:com.android.tools.r8.graph.DexField toReference():116:116 -> n
     1:1:com.android.tools.r8.graph.DexReference toReference():24 -> n
-    1:1:com.android.tools.r8.graph.DexField toReference():112:112 -> p
+    1:1:com.android.tools.r8.graph.DexField toReference():116:116 -> p
     1:1:com.android.tools.r8.graph.DexMember toReference():24 -> p
-    1:2:void clearStaticValue():179:180 -> q
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():72:72 -> r
-    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():58:64 -> s
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():54:54 -> t
-    1:1:java.lang.String toSmaliString():102:102 -> toSmaliString
-    1:1:java.lang.String toSourceString():107:107 -> toSourceString
-    1:1:java.lang.String toString():97:97 -> toString
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():184:185 -> u
-    1:1:boolean hasAnnotation():164:164 -> v
-    1:2:boolean hasExplicitStaticValue():168:169 -> w
-    1:1:boolean isEnum():126:126 -> x
+    1:2:void clearStaticValue():183:184 -> q
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():76:76 -> r
+    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():62:68 -> s
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():58:58 -> t
+    1:1:java.lang.String toSmaliString():106:106 -> toSmaliString
+    1:1:java.lang.String toSourceString():111:111 -> toSourceString
+    1:1:java.lang.String toString():101:101 -> toString
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():188:189 -> u
+    1:1:boolean hasAnnotation():168:168 -> v
+    1:2:boolean hasExplicitStaticValue():172:173 -> w
+    1:1:boolean isEnum():130:130 -> x
     2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isEnum():102:102 -> x
-    2:2:boolean isEnum():126 -> x
-    1:1:boolean isVolatile():160:160 -> y
+    2:2:boolean isEnum():130 -> x
+    1:1:boolean isVolatile():164:164 -> y
     2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():86:86 -> y
-    2:2:boolean isVolatile():160 -> y
-    1:1:com.android.tools.r8.graph.DexField toReference():112:112 -> z
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.graph.U:
+    2:2:boolean isVolatile():164 -> y
+    1:1:com.android.tools.r8.graph.DexField toReference():116:116 -> z
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.graph.V:
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotationSet):10:10 -> <init>
     com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> d
     1:2:boolean equals(java.lang.Object):35:36 -> equals
@@ -16950,7 +17097,7 @@
     1:1:com.android.tools.r8.graph.DexReference toReference():6:6 -> n
     1:1:com.android.tools.r8.graph.DexType holder():14:14 -> o
     com.android.tools.r8.graph.DexMember toReference() -> p
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.V:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.W:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> h
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> i
     com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinMemberInfo -> k
@@ -16958,302 +17105,309 @@
     boolean d8R8Synthesized -> p
     int classFileVersion -> j
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotationsList -> e
-    boolean $assertionsDisabled -> u
-    com.android.tools.r8.graph.DexEncodedMethod ANNOTATION_REFERENCE -> s
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap NO_PARAMETER_INFO -> t
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> m
     com.android.tools.r8.graph.DexEncodedMethod SENTINEL -> r
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap NO_PARAMETER_INFO -> s
     com.android.tools.r8.graph.DexMethod method -> c
+    boolean $assertionsDisabled -> t
     com.android.tools.r8.graph.Code code -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap parameterInfo -> n
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> g
     com.android.tools.r8.graph.DexEncodedMethod defaultInterfaceMethodImplementation -> l
     com.android.tools.r8.graph.DexEncodedMethod[] EMPTY_ARRAY -> q
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> d
-    1:48:void <clinit>():79:126 -> <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):214:214 -> <init>
-    2:2: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):224:224 -> <init>
-    3:3: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,boolean):245:245 -> <init>
-    4:122: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,boolean):135:253 -> <init>
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1226:1230 -> A
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1221:1222 -> B
-    1:1:java.util.Map getParameterInfo():618:618 -> C
-    1:2:boolean hasAnnotation():1212:1213 -> D
-    1:2:boolean hasClassFileVersion():679:680 -> E
-    1:1:boolean hasCode():659:659 -> F
-    1:1:boolean hasParameterInfo():614:614 -> G
-    1:1:boolean isAbstract():325:325 -> H
-    1:2:boolean isClassInitializer():368:369 -> I
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> I
-    3:3:boolean isClassInitializer():369 -> I
-    4:4:boolean isClassInitializer():369:369 -> I
-    1:1:boolean isD8R8Synthesized():162:162 -> J
-    1:1:boolean isDefaultMethod():374:374 -> K
-    1:2:boolean isDirectMethod():426:427 -> L
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> L
-    3:3:boolean isDirectMethod():427 -> L
-    4:4:boolean isDirectMethod():427:427 -> L
-    1:1:boolean isFinal():333:333 -> M
-    1:2:boolean isInitializer():353:354 -> N
-    1:2:boolean isInstanceInitializer():358:359 -> O
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> O
-    3:3:boolean isInstanceInitializer():359 -> O
-    4:4:boolean isInstanceInitializer():359:359 -> O
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():278:278 -> P
-    1:2:boolean isNonAbstractNonNativeMethod():403:404 -> Q
-    1:2:boolean isNonAbstractVirtualMethod():398:399 -> R
-    1:2:boolean isNonPrivateVirtualMethod():389:390 -> S
-    1:1:boolean isObsolete():172:172 -> T
-    1:1:boolean isOnlyInlinedIntoNestMembers():477:477 -> U
-    1:2:boolean isPrivateMethod():418:419 -> V
-    1:2:boolean isProcessed():320:321 -> W
-    1:2:boolean isPublicMethod():413:414 -> X
-    1:2:boolean isPublicized():408:409 -> Y
-    1:2:boolean isStatic():432:433 -> Z
+    1:45:void <clinit>():79: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):211:211 -> <init>
+    2:2: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):221:221 -> <init>
+    3:3: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,boolean):242:242 -> <init>
+    4:122: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,boolean):132:250 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():448:448 -> A
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1229:1233 -> B
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1224:1225 -> C
+    1:1:java.util.Map getParameterInfo():615:615 -> D
+    1:2:boolean hasAnnotation():1215:1216 -> E
+    1:2:boolean hasClassFileVersion():676:677 -> F
+    1:1:boolean hasCode():656:656 -> G
+    1:1:boolean hasParameterInfo():611:611 -> H
+    1:1:boolean isAbstract():322:322 -> I
+    1:2:boolean isClassInitializer():365:366 -> J
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> J
+    3:3:boolean isClassInitializer():366 -> J
+    4:4:boolean isClassInitializer():366:366 -> J
+    1:1:boolean isD8R8Synthesized():159:159 -> K
+    1:1:boolean isDefaultMethod():371:371 -> L
+    1:2:boolean isDirectMethod():423:424 -> M
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> M
+    3:3:boolean isDirectMethod():424 -> M
+    4:4:boolean isDirectMethod():424:424 -> M
+    1:1:boolean isFinal():330:330 -> N
+    1:2:boolean isInitializer():350:351 -> O
+    1:2:boolean isInstanceInitializer():355:356 -> P
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> P
+    3:3:boolean isInstanceInitializer():356 -> P
+    4:4:boolean isInstanceInitializer():356:356 -> P
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():275:275 -> Q
+    1:2:boolean isNonAbstractNonNativeMethod():400:401 -> R
+    1:2:boolean isNonAbstractVirtualMethod():395:396 -> S
+    1:2:boolean isNonPrivateVirtualMethod():386:387 -> T
+    1:1:boolean isObsolete():169:169 -> U
+    1:1:boolean isOnlyInlinedIntoNestMembers():474:474 -> V
+    1:2:boolean isPrivateMethod():415:416 -> W
+    1:2:boolean isProcessed():317:318 -> X
+    1:1:boolean isPublic():342:342 -> Y
+    1:2:boolean isPublicMethod():410:411 -> Z
     1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     2:2:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):79:79 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$602(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):79:79 -> a
-    4:5:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):282:283 -> a
-    6:6:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    6:6:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):284 -> a
-    7:9:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):284:284 -> a
-    12:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):287:289 -> a
-    15:15:boolean com.android.tools.r8.utils.BooleanLatticeElement.isPossiblyFalse():52:52 -> a
-    15:15:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):290 -> a
-    16:21:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):289:294 -> a
-    22:25:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):306:309 -> a
-    26:26:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):316:316 -> a
-    27:28:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):464:465 -> a
-    29:31:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:487 -> a
-    32:32:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):486:486 -> a
-    33:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):495:550 -> a
-    89:89:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):546:546 -> a
-    90:90:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):542:542 -> a
-    91:94:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):535:538 -> a
-    95:98:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):528:531 -> a
-    99:102:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):521:524 -> a
-    103:106:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):514:517 -> a
-    107:126:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):555:574 -> a
-    127:127:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):571:571 -> a
-    128:128:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):568:568 -> a
-    129:129:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):565:565 -> a
-    130:130:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):562:562 -> a
-    131:149:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):559:577 -> a
-    150:153:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):586:589 -> a
-    154:154:boolean hasParameterInfo():614:614 -> a
-    154:154:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):589 -> a
-    155:156:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):589:590 -> a
-    157:158:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):609:610 -> a
-    157:158:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):590 -> a
-    159:159:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):592:592 -> a
-    160:162:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):596:598 -> a
-    163:166:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):602:605 -> a
-    167:168:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1221:1222 -> a
-    167:168:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):605 -> a
-    169:169:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):605:605 -> a
-    170:175:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):646:651 -> a
-    176:184:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):700:708 -> a
-    185:197:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):712:724 -> a
-    198:255:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):346:403 -> a
-    198:255:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):725 -> a
-    256:259:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):725:728 -> a
-    260:269:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):755:764 -> a
-    270:274:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):827:831 -> a
-    275:280:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):830:835 -> a
-    281:282:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):930:931 -> a
-    283:297:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):935:949 -> a
-    298:302:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):953:957 -> a
-    303:327:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    303:327:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):959 -> a
-    328:341:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):960:973 -> a
-    342:342:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():192:192 -> a
-    342:342:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):973 -> a
-    343:343:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):974:974 -> a
-    344:349:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):979:984 -> a
-    350:378:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):981:1009 -> a
-    379:379: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,boolean):234:234 -> a
-    379:379:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1009 -> a
-    380:380:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1009:1009 -> a
-    381:381:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):989:989 -> a
-    382:385:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):992:995 -> a
-    386:386:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():495:495 -> a
-    386:386:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():511 -> a
-    386:386:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):996 -> a
-    387:387:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():511:511 -> a
-    387:387:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):996 -> a
-    388:390:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):997:999 -> a
-    391:391:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():503:503 -> a
-    391:391:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):999 -> a
-    392:393:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):999:1000 -> a
-    394:396:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1015:1017 -> a
-    397:407: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):1028:1038 -> a
-    408:408: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,boolean):234:234 -> a
-    408:408: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):1038 -> a
-    409:414:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1075:1080 -> a
-    415:415:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():241:241 -> a
-    415:415:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1080 -> a
-    416:423:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1082:1089 -> a
-    424:424:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():172:172 -> a
-    424:424:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1089 -> a
-    425:425:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1092:1092 -> a
-    426:426:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    426:426:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1092 -> a
-    427:451:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    427:451:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1094 -> a
-    452:472:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1096:1116 -> a
-    473:476:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):1105:1108 -> a
-    477:484: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):1121:1128 -> a
-    485:485:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():176:176 -> a
-    485:485: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):1129 -> a
-    486:510:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    486:510: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):1131 -> a
-    511:520: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):1132:1141 -> a
-    521:521: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,boolean):234:234 -> a
-    521:521: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):1141 -> a
-    522:533:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1163:1174 -> a
-    534:544:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1173:1183 -> a
-    545:546:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1234:1235 -> a
-    547:548:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1245:1246 -> a
-    1:1:boolean isSynchronized():349:349 -> a0
-    2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> a0
-    2:2:boolean isSynchronized():349 -> a0
+    4:7:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):279:282 -> a
+    8:14:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):281:287 -> a
+    15:20:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):286:291 -> a
+    21:24:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):303:306 -> a
+    25:25:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):313:313 -> a
+    26:27:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):461:462 -> a
+    28:30:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):482:484 -> a
+    31:31:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):483:483 -> a
+    32:87:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):492:547 -> a
+    88:88:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):543:543 -> a
+    89:89:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):539:539 -> a
+    90:93:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):532:535 -> a
+    94:97:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):525:528 -> a
+    98:101:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):518:521 -> a
+    102:105:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):511:514 -> a
+    106:125:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):552:571 -> a
+    126:126:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):568:568 -> a
+    127:127:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):565:565 -> a
+    128:128:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):562:562 -> a
+    129:129:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):559:559 -> a
+    130:148:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):556:574 -> a
+    149:152:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):583:586 -> a
+    153:153:boolean hasParameterInfo():611:611 -> a
+    153:153:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):586 -> a
+    154:155:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):586:587 -> a
+    156:157:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):606:607 -> a
+    156:157:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):587 -> a
+    158:158:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):589:589 -> a
+    159:161:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):593:595 -> a
+    162:165:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):599:602 -> a
+    166:167:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1224:1225 -> a
+    166:167:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):602 -> a
+    168:168:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):602:602 -> a
+    169:174:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):643:648 -> a
+    175:183:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):697:705 -> a
+    184:196:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):709:721 -> a
+    197:254:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):346:403 -> a
+    197:254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):722 -> a
+    255:258:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):722:725 -> a
+    259:268:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):752:761 -> a
+    269:276:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):787:794 -> a
+    277:281:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):830:834 -> a
+    282:287:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):833:838 -> a
+    288:289:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):933:934 -> a
+    290:304:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):938:952 -> a
+    305:309:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):956:960 -> a
+    310:334:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
+    310:334:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):962 -> a
+    335:343:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):963:971 -> a
+    344:351:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):969:976 -> a
+    352:352:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():192:192 -> a
+    352:352:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):976 -> a
+    353:353:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):977:977 -> a
+    354:359:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):982:987 -> a
+    360:388:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):984:1012 -> a
+    389:389: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,boolean):231:231 -> a
+    389:389:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1012 -> a
+    390:390:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1012:1012 -> a
+    391:391:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):992:992 -> a
+    392:395:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):995:998 -> a
+    396:396:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():495:495 -> a
+    396:396:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():511 -> a
+    396:396:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):999 -> a
+    397:397:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():511:511 -> a
+    397:397:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):999 -> a
+    398:400:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1000:1002 -> a
+    401:401:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():503:503 -> a
+    401:401:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1002 -> a
+    402:403:void lambda$createFieldAccessorBridge$3(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1002:1003 -> a
+    404:406:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1018:1020 -> a
+    407:417: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):1031:1041 -> a
+    418:418: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,boolean):231:231 -> a
+    418:418: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):1041 -> a
+    419:424:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1078:1083 -> a
+    425:425:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():241:241 -> a
+    425:425:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1083 -> a
+    426:433:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1085:1092 -> a
+    434:434:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():172:172 -> a
+    434:434:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1092 -> a
+    435:435:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1095:1095 -> a
+    436:436:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    436:436:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1095 -> a
+    437:461:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
+    437:461:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1097 -> a
+    462:469:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1099:1106 -> a
+    470:485:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1104:1119 -> a
+    486:489:void lambda$toForwardingMethod$5(com.android.tools.r8.graph.UseRegistry):1108:1111 -> a
+    490:497: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):1124:1131 -> a
+    498:498:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():176:176 -> a
+    498:498: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):1132 -> a
+    499:523:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
+    499:523: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):1134 -> a
+    524: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):1135:1145 -> a
+    535:535: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,boolean):231:231 -> a
+    535:535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1145 -> a
+    536:547:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1166:1177 -> a
+    548:558:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1176:1186 -> a
+    559:560:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1237:1238 -> a
+    561:562:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1253:1254 -> a
+    1:2:boolean isPublicized():405:406 -> a0
     1:1:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> b
-    2:2:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):273:273 -> b
-    3:3:boolean lambda$liveParameterAnnotations$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):274:274 -> b
-    4:6:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):298:300 -> b
-    7:9:void upgradeClassFileVersion(int):684:686 -> b
-    10:10:void lambda$toInitializerForwardingBridge$1(com.android.tools.r8.graph.UseRegistry):968:968 -> b
-    11:14:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1044:1047 -> b
-    15:39:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> b
-    15:39:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1049 -> b
-    40:60:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1051:1071 -> b
-    1:2:boolean isSyntheticMethod():446:447 -> b0
+    2:2:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):270:270 -> b
+    3:3:boolean lambda$liveParameterAnnotations$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):271:271 -> b
+    4:6:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):295:297 -> b
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):781 -> b
+    8:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():809:818 -> b
+    8:17:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):782 -> b
+    18:18:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):783:783 -> b
+    19:21:void upgradeClassFileVersion(int):681:683 -> b
+    22:22:void lambda$toInitializerForwardingBridge$1(com.android.tools.r8.graph.UseRegistry):971:971 -> b
+    23:26:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1047:1050 -> b
+    27:51:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> b
+    27:51:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1052 -> b
+    52:58:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1054:1060 -> b
+    59:75:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1058:1074 -> b
+    1:2:boolean isStatic():429:430 -> b0
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$500(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> c
-    2:3:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):819:820 -> c
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):840:844 -> c
-    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):843:850 -> c
-    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):849:855 -> c
-    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):853:868 -> c
-    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    40:40:void setObsolete():178:178 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):869 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):870:870 -> c
-    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):820 -> c
-    42:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822:822 -> c
-    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):874:878 -> c
-    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):877:885 -> c
-    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):882:890 -> c
-    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):887:895 -> c
-    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):893:897 -> c
-    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    80:81:boolean isStaticMember():438:439 -> c
-    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):898 -> c
-    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):902:924 -> c
-    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    105:105:void setObsolete():178:178 -> c
-    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):925 -> c
-    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):926:926 -> c
-    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822 -> c
-    107:110:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1059:1062 -> c
-    1:2:boolean isVirtualMethod():384:385 -> c0
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> c0
-    3:3:boolean isVirtualMethod():385 -> c0
-    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):630:636 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):641:641 -> collectMixedSectionItems
+    2:3:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):822:823 -> c
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):843:847 -> c
+    4:8:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):846:853 -> c
+    9:16:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):852:858 -> c
+    17:23:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):856:871 -> c
+    24:39:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    40:40:void setObsolete():175:175 -> c
+    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):872 -> c
+    40:40:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):873:873 -> c
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):823 -> c
+    42:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825:825 -> c
+    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):877:881 -> c
+    43:47:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):880:888 -> c
+    48:56:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):885:893 -> c
+    57:65:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):890:898 -> c
+    66:74:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):896:900 -> c
+    75:79:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    80:81:boolean isStaticMember():435:436 -> c
+    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):901 -> c
+    80:81:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):905:927 -> c
+    82:104:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    105:105:void setObsolete():175:175 -> c
+    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):928 -> c
+    105:105:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):929:929 -> c
+    106:106:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):825 -> c
+    107:110:void lambda$toStaticForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1062:1065 -> c
+    1:1:boolean isSynchronized():346:346 -> c0
+    2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():124:124 -> c0
+    2:2:boolean isSynchronized():346 -> c0
+    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):627:633 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):638:638 -> collectMixedSectionItems
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> d
-    1:2:void markNotProcessed():581:582 -> d0
+    1:2:boolean isSyntheticMethod():443:444 -> d0
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo access$700(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> e
-    2:2:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1207:1207 -> e
-    1:2:java.lang.String qualifiedName():690:691 -> e0
+    2:2:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1210:1210 -> e
+    1:2:boolean isVirtualMethod():381:382 -> e0
+    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> e0
+    3:3:boolean isVirtualMethod():382 -> e0
     1:1:int access$800(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> f
-    1:2:void removeCode():668:669 -> f0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1261:1261 -> g
-    1:1:com.android.tools.r8.graph.DexType returnType():269:269 -> g0
-    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1250:1252 -> h
-    1:1:void setObsolete():178:178 -> h0
-    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):186:190 -> i
+    1:2:void markNotProcessed():578:579 -> f0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1269:1269 -> g
+    1:1:com.android.tools.r8.graph.DexTypeList parameters():258:258 -> g0
+    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1258:1260 -> h
+    1:2:java.lang.String qualifiedName():687:688 -> h0
+    1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):183:187 -> i
     6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():172:172 -> i
-    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):190 -> i
-    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):191:192 -> i
-    1:1:boolean shouldNotHaveCode():655:655 -> i0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1257:1257 -> j
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():738:744 -> j0
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():172:172 -> j0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():744 -> j0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():745:745 -> j0
-    1:1:boolean isDexEncodedMethod():1201:1201 -> k
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():809:815 -> k0
-    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():785:794 -> l0
-    1:2:boolean isStaticMember():438:439 -> m
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1195:1196 -> m0
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1195:1196 -> n
+    6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):187 -> i
+    7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):188:189 -> i
+    1:2:void removeCode():665:666 -> i0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1265:1265 -> j
+    1:1:com.android.tools.r8.graph.DexType returnType():266:266 -> j0
+    1:1:boolean isDexEncodedMethod():1204:1204 -> k
+    1:1:void setObsolete():175:175 -> k0
+    1:1:boolean shouldNotHaveCode():652:652 -> l0
+    1:2:boolean isStaticMember():435:436 -> m
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():735:741 -> m0
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():172:172 -> m0
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():741 -> m0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():742:742 -> m0
+    1:2:com.android.tools.r8.graph.DexMethod toReference():1198:1199 -> n
     1:2:com.android.tools.r8.graph.DexReference toReference():79 -> n
-    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1147:1154 -> n0
-    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1250:1252 -> n0
-    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1155 -> n0
-    12:12:void setObsolete():178:178 -> n0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1156 -> n0
-    1:1:void unsetObsolete():205:205 -> o0
-    1:2:com.android.tools.r8.graph.DexMethod toReference():1195:1196 -> p
+    1:2:com.android.tools.r8.graph.DexMethod toReference():1198:1199 -> n0
+    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1150:1157 -> o0
+    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1258:1260 -> o0
+    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1158 -> o0
+    12:12:void setObsolete():175:175 -> o0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1159 -> o0
+    1:2:com.android.tools.r8.graph.DexMethod toReference():1198:1199 -> p
     1:2:com.android.tools.r8.graph.DexMember toReference():79 -> p
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():798:805 -> q
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():774:775 -> r
-    1:1:void checkIfObsolete():166:166 -> s
-    1:2:java.lang.String codeToString():1189:1190 -> t
-    1:2:java.lang.String toSourceString():733:734 -> toSourceString
-    1:2:java.lang.String toString():623:624 -> toString
-    1:2:java.lang.String descriptor():695:696 -> u
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1239:1240 -> v
-    1:3:int getClassFileVersion():673:675 -> w
-    1:2:com.android.tools.r8.graph.Code getCode():663:664 -> x
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():182:182 -> y
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():451:451 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.V$a:
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.V$b:
-    com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
+    1:1:void unsetObsolete():202:202 -> p0
+    1:2:void abandonCallSiteOptimizationInfo():1242:1243 -> q
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():798:805 -> r
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():771:772 -> s
+    1:1:void checkIfObsolete():163:163 -> t
+    1:2:java.lang.String toSourceString():730:731 -> toSourceString
+    1:2:java.lang.String toString():620:621 -> toString
+    1:2:java.lang.String codeToString():1192:1193 -> u
+    1:2:java.lang.String descriptor():692:693 -> v
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1247:1248 -> w
+    1:3:int getClassFileVersion():670:672 -> x
+    1:2:com.android.tools.r8.graph.Code getCode():660:661 -> y
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():179:179 -> z
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.W$a:
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.W$b:
+    com.android.tools.r8.graph.Code code -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
-    com.android.tools.r8.graph.Code code -> e
-    com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinMemberInfo -> h
-    com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> d
-    boolean d8R8Synthesized -> j
-    boolean $assertionsDisabled -> k
-    int classFileVersion -> i
+    com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> g
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo optimizationInfo -> h
+    com.android.tools.r8.kotlin.KotlinMethodLevelInfo kotlinMemberInfo -> i
+    int classFileVersion -> j
+    com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> d
+    com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> e
+    boolean d8R8Synthesized -> k
+    boolean $assertionsDisabled -> l
     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>():1264:1264 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1264:1264 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1264:1264 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1278:1278 -> <init>
-    4:22:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1281:1299 -> <init>
-    23:23:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1295:1295 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1264:1264 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1304:1304 -> a
-    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1313:1332 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1308:1308 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1332 -> a
-    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1335:1337 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1308:1308 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1335 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1357:1359 -> a
-    31:31:void setCode(com.android.tools.r8.graph.Code):1365:1365 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1369:1374 -> b
-    7:20:com.android.tools.r8.graph.DexEncodedMethod build():1373:1386 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1342:1342 -> c
+    1:1:void <clinit>():1272:1272 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1272:1272 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1272:1272 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1287:1287 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1290:1290 -> <init>
+    5:36:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1277:1308 -> <init>
+    37:37:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1304:1304 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1272:1272 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1313:1313 -> a
+    3:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1317:1318 -> a
+    5:24:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1328:1347 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1323:1323 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1347 -> a
+    26:28:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1350:1352 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1323:1323 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1350 -> a
+    30:32:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1372:1374 -> a
+    33:33:void setCode(com.android.tools.r8.graph.Code):1380:1380 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1384:1389 -> b
+    7:22:com.android.tools.r8.graph.DexEncodedMethod build():1388:1403 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1357:1357 -> c
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():254:254 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1342 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1347:1351 -> d
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.V$c:
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1357 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1362:1366 -> d
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.W$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
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_NOT_INLINING_CANDIDATE -> b
@@ -17265,7 +17419,7 @@
     1:24:void <clinit>():93:116 -> <clinit>
     25:25:void <clinit>():89:89 -> <clinit>
     1:1:void <init>(java.lang.String,int):89:89 -> <init>
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.W:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.X:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType type -> d
     1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,boolean):16:21 -> <init>
@@ -17299,7 +17453,7 @@
     1:1:java.lang.String toSmaliString():116:116 -> toSmaliString
     1:1:java.lang.String toSourceString():121:121 -> toSourceString
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.X:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.Y:
     1:1:void <init>():12:12 -> <init>
     1:1:void collectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):15:15 -> a
     2:2:void lambda$collectAll$0(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem):15:15 -> a
@@ -17312,454 +17466,453 @@
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> collectIndexedItems
     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.Y:
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.Z:
     com.android.tools.r8.graph.DexString getClassMethodName -> A0
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> p4
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> Q
     com.android.tools.r8.graph.DexString classDescriptor -> b1
-    com.android.tools.r8.graph.DexType boxedShortType -> F2
-    com.android.tools.r8.graph.DexType varHandleType -> g3
-    boolean skipNameValidationForTesting -> L5
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> h5
+    com.android.tools.r8.graph.DexType boxedLongType -> F2
+    com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers javaMathBigIntegerMembers -> N4
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> g3
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> z5
+    com.android.tools.r8.graph.DexType annotationThrows -> h5
     java.util.concurrent.ConcurrentHashMap referenceTypes -> q
     com.android.tools.r8.graph.DexString getSimpleNameName -> I0
     com.android.tools.r8.graph.DexString annotationDescriptor -> j1
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> A5
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> G4
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> l4
     com.android.tools.r8.graph.DexString substringName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
     com.android.tools.r8.graph.DexString icceDescriptor -> R1
     java.util.Map types -> c
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> W3
-    com.android.tools.r8.graph.DexType longArrayType -> w2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> W3
+    com.android.tools.r8.graph.DexType intArrayType -> w2
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers androidOsBuildMembers -> H4
     com.android.tools.r8.graph.DexString initMethodName -> z0
-    java.util.Set libraryMethodsReturningNonNull -> G5
-    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> Z1
-    com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers androidSystemOsConstantsMembers -> L4
-    com.android.tools.r8.graph.DexType npeType -> O3
-    com.android.tools.r8.graph.DexType shortType -> o2
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Z1
+    com.android.tools.r8.graph.DexType javaIoFileType -> O3
+    com.android.tools.r8.graph.DexType longType -> o2
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> w4
     com.android.tools.r8.graph.DexString unboxLongMethodName -> a0
-    com.android.tools.r8.graph.DexType intConsumer -> G3
+    com.android.tools.r8.graph.DexType longConsumer -> G3
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> R
-    com.android.tools.r8.graph.DexType androidViewViewType -> h4
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> H4
     com.android.tools.r8.graph.DexString optionalDescriptor -> I1
-    com.android.tools.r8.graph.DexString enumUnboxingUtilityDescriptor -> k4
     com.android.tools.r8.graph.DexString endsWithMethodName -> i0
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> A4
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> t4
     com.android.tools.r8.graph.DexString illegalArgumentExceptionDescriptor -> Q1
     com.android.tools.r8.graph.DexString assertionsDisabled -> Q0
     com.android.tools.r8.graph.DexString varHandleDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType comparableType -> y5
     java.util.Map fields -> d
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> W2
-    com.android.tools.r8.graph.DexType consumerType -> x3
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> q4
-    com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers javaNioByteOrderMembers -> P4
+    com.android.tools.r8.graph.DexType strictMathType -> W2
+    com.android.tools.r8.graph.DexType supplierType -> x3
     com.android.tools.r8.graph.DexString stringArrayDescriptor -> Y0
     com.android.tools.r8.graph.DexString setDescriptor -> z1
-    com.android.tools.r8.graph.DexType callSiteType -> q5
-    com.android.tools.r8.graph.DexType classArrayType -> O2
-    com.android.tools.r8.graph.DexType setType -> p3
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> B5
-    com.android.tools.r8.graph.DexString constructorMethodName -> b2
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> D4
+    com.android.tools.r8.graph.DexType lookupType -> q5
+    com.android.tools.r8.graph.DexType objectArrayType -> O2
+    com.android.tools.r8.graph.DexType listType -> p3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> B5
+    com.android.tools.r8.graph.DexString newUpdaterName -> b2
     com.android.tools.r8.graph.DexString mapDescriptor -> A1
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> y4
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexType annotationSignature -> g5
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> f3
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> g5
+    com.android.tools.r8.graph.DexType javaLangSystemType -> f3
     com.android.tools.r8.graph.DexString enumDescriptor -> i1
-    com.android.tools.r8.graph.DexType boxedLongType -> E2
+    com.android.tools.r8.graph.DexType boxedIntType -> E2
     com.android.tools.r8.graph.DexString getCanonicalNameName -> H0
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> m4
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> o4
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> m4
     com.android.tools.r8.graph.DexString newInstanceName -> P0
     com.android.tools.r8.graph.DexString stringBufferDescriptor -> q1
     com.android.tools.r8.graph.DexString cloneMethodName -> q0
-    com.android.tools.r8.graph.DexType intArrayType -> v2
+    com.android.tools.r8.graph.DexType floatArrayType -> v2
+    java.util.List libraryMembersCollection -> U4
     com.android.tools.r8.graph.DexString descriptorSeparator -> C
-    com.android.tools.r8.graph.DexType javaUtilListType -> V3
-    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> Y1
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> V3
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> Y1
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> x4
     com.android.tools.r8.graph.DexString wrapperFieldName -> y0
-    com.android.tools.r8.graph.DexType longType -> n2
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> o4
+    com.android.tools.r8.graph.DexType intType -> n2
     java.util.Map protos -> e
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> N3
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> N3
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> a1
-    java.util.Set libraryMethodsReturningReceiver -> F5
+    java.util.Set libraryMethodsReturningNonNull -> F5
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> T
+    com.android.tools.r8.graph.DexString enumUnboxingUtilityDescriptor -> j4
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> g4
+    com.android.tools.r8.graph.DexType androidViewViewType -> g4
+    com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers androidViewViewMembers -> L4
     com.android.tools.r8.graph.DexString startsWithMethodName -> h0
     com.android.tools.r8.graph.DexString runnableDescriptor -> H1
-    com.android.tools.r8.graph.DexType longConsumer -> F3
-    com.android.tools.r8.graph.DexItemFactory$DoubleMethods doubleMethods -> v4
-    java.util.List libraryMembersCollection -> V4
+    com.android.tools.r8.graph.DexType doubleConsumer -> F3
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> p0
     com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> P1
-    com.android.tools.r8.graph.DexType strictMathType -> V2
-    com.android.tools.r8.graph.DexType supplierType -> w3
+    com.android.tools.r8.graph.DexType mathType -> V2
+    com.android.tools.r8.graph.DexType callableType -> w3
     com.android.tools.r8.graph.DexString booleanArrayDescriptor -> D
-    com.android.tools.r8.graph.DexType cloneableType -> x5
+    com.android.tools.r8.graph.DexType comparableType -> x5
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> h
     com.android.tools.r8.graph.DexString stringDescriptor -> X0
     com.android.tools.r8.graph.DexString listDescriptor -> y1
-    com.android.tools.r8.graph.DexType objectArrayType -> N2
-    com.android.tools.r8.graph.DexType listType -> o3
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> p4
+    com.android.tools.r8.graph.DexType objectType -> N2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> o3
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> A5
+    com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers javaNioByteOrderMembers -> O4
     java.util.Map methods -> f
-    com.android.tools.r8.graph.DexType metafactoryType -> p5
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> z4
-    com.android.tools.r8.graph.DexString newUpdaterName -> a2
+    com.android.tools.r8.graph.DexType callSiteType -> p5
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> a2
     com.android.tools.r8.graph.DexString ordinalMethodName -> C0
     com.android.tools.r8.graph.DexString autoCloseableDescriptor -> d1
-    com.android.tools.r8.graph.DexType javaLangSystemType -> e3
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> Z4
+    com.android.tools.r8.graph.DexType stringBufferType -> e3
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> r4
     java.util.Map setFiles -> o
-    com.android.tools.r8.graph.DexType boxedIntType -> D2
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> f5
+    com.android.tools.r8.graph.DexType boxedFloatType -> D2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> P4
+    com.android.tools.r8.graph.DexType annotationSignature -> f5
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> K0
     com.android.tools.r8.graph.DexString collectionsDescriptor -> l1
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> n4
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> B4
     com.android.tools.r8.graph.DexString valueOfMethodName -> t0
     com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> T1
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> U3
-    com.android.tools.r8.graph.DexType floatArrayType -> u2
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> I5
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> M3
+    com.android.tools.r8.graph.DexType javaUtilListType -> U3
+    com.android.tools.r8.graph.DexType doubleArrayType -> u2
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> n4
+    java.util.Set libraryTypesAssumedToBePresent -> I5
+    com.android.tools.r8.graph.DexType npeType -> M3
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> M
-    com.android.tools.r8.graph.DexType intType -> m2
-    com.android.tools.r8.graph.DexString thisName -> d2
+    com.android.tools.r8.graph.DexType floatType -> m2
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> d2
     com.android.tools.r8.graph.DexString collectionDescriptor -> C1
-    com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers androidViewViewMembers -> M4
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> c0
-    com.android.tools.r8.graph.DexType androidUtilLogType -> f4
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> f4
+    com.android.tools.r8.graph.DexString unknownTypeName -> M5
     java.util.Map setInlineFrames -> p
-    com.android.tools.r8.graph.DexType doubleConsumer -> E3
+    com.android.tools.r8.graph.DexType streamType -> E3
     com.android.tools.r8.graph.DexString optionalIntDescriptor -> K1
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> k0
+    com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers javaIoFileMembers -> M4
     com.android.tools.r8.graph.DexString invokeExactMethodName -> S0
     com.android.tools.r8.graph.DexString methodTypeDescriptor -> t1
-    com.android.tools.r8.graph.DexType externalizableType -> w5
+    com.android.tools.r8.graph.DexType cloneableType -> w5
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> m
-    com.android.tools.r8.graph.DexType mathType -> U2
-    com.android.tools.r8.graph.DexType callableType -> v3
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> r4
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> o5
-    com.android.tools.r8.graph.DexType objectType -> M2
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> n3
-    java.util.IdentityHashMap internalSentinels -> O5
+    com.android.tools.r8.graph.DexType iterableType -> U2
+    com.android.tools.r8.graph.DexType comparatorType -> v3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers javaUtilConcurrentTimeUnitMembers -> R4
+    com.android.tools.r8.graph.DexType metafactoryType -> o5
+    com.android.tools.r8.graph.DexType stringArrayType -> M2
+    com.android.tools.r8.graph.DexType serviceLoaderRewrittenClassType -> n3
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> N
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> D5
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> c1
-    com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers javaMathBigIntegerMembers -> O4
     com.android.tools.r8.graph.DexString finalizeMethodName -> B0
-    com.android.tools.r8.graph.DexType boxedFloatType -> C2
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> Q4
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> e5
-    com.android.tools.r8.graph.DexType stringBufferType -> d3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> C2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> e5
+    com.android.tools.r8.graph.DexType stringBuilderType -> d3
     com.android.tools.r8.graph.DexString objectsDescriptor -> k1
     com.android.tools.r8.graph.DexString getTypeNameName -> J0
     com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> S1
     com.android.tools.r8.graph.DexString trimName -> s0
-    com.android.tools.r8.graph.DexType doubleArrayType -> t2
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> T3
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers androidOsBuildMembers -> I4
-    com.android.tools.r8.graph.DexType floatType -> l2
-    com.android.tools.r8.graph.DexType nullValueType -> M5
+    com.android.tools.r8.graph.DexType charArrayType -> t2
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> T3
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> A4
+    com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers androidSystemOsConstantsMembers -> K4
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> H5
+    com.android.tools.r8.graph.DexType doubleType -> l2
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> I4
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> O
     com.android.tools.r8.graph.DexType icceType -> L3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> P
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> b0
     com.android.tools.r8.graph.DexString mapEntryDescriptor -> B1
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> c2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> x4
+    com.android.tools.r8.graph.DexString constructorMethodName -> c2
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> G4
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> n
-    com.android.tools.r8.graph.DexType streamType -> D3
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> E5
+    com.android.tools.r8.graph.DexType optionalLongType -> D3
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> r
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> e4
+    com.android.tools.r8.graph.DexType androidUtilLogType -> e4
     com.android.tools.r8.graph.DexString equalsMethodName -> j0
     com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> J1
-    com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers javaIoFileMembers -> N4
     com.android.tools.r8.graph.DexString invokeMethodName -> R0
     com.android.tools.r8.graph.DexString methodHandleDescriptor -> s1
     java.util.Map strings -> b
-    com.android.tools.r8.graph.DexType iterableType -> T2
-    com.android.tools.r8.graph.DexType comparatorType -> u3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers javaUtilConcurrentTimeUnitMembers -> S4
-    com.android.tools.r8.kotlin.Kotlin kotlin -> F4
-    com.android.tools.r8.graph.DexType serializableType -> v5
+    com.android.tools.r8.graph.DexType collectionsType -> T2
+    com.android.tools.r8.graph.DexType collectionType -> u3
+    com.android.tools.r8.graph.DexType externalizableType -> v5
     com.android.tools.r8.graph.DexString objectDescriptor -> Z0
-    com.android.tools.r8.graph.DexType stringArrayType -> L2
-    com.android.tools.r8.graph.DexType serviceLoaderRewrittenClassType -> m3
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> C5
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> n5
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> l5
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> Y4
+    com.android.tools.r8.graph.DexType stringType -> L2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> m3
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> C5
+    java.util.IdentityHashMap internalSentinels -> N5
+    boolean $assertionsDisabled -> O5
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> n5
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> l5
+    java.util.Map libraryMethodsWithoutSideEffects -> G5
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> E0
     com.android.tools.r8.graph.DexString constructorDescriptor -> f1
-    com.android.tools.r8.graph.DexType boxedDoubleType -> B2
-    com.android.tools.r8.graph.DexType stringBuilderType -> c3
+    com.android.tools.r8.graph.DexType boxedCharType -> B2
+    com.android.tools.r8.graph.DexType autoCloseableType -> c3
     com.android.tools.r8.graph.DexString unboxShortMethodName -> Y
-    com.android.tools.r8.graph.DexType annotationInnerClass -> d5
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> d5
     com.android.tools.r8.graph.DexString longDescriptor -> z
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> M0
     com.android.tools.r8.graph.DexString mathDescriptor -> n1
     com.android.tools.r8.graph.DexString toStringMethodName -> v0
-    java.util.Set libraryClassesWithoutStaticInitialization -> K5
     com.android.tools.r8.graph.DexString npeDescriptor -> V1
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> S3
-    com.android.tools.r8.graph.DexType charArrayType -> s2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> C4
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> S3
+    com.android.tools.r8.graph.DexType byteArrayType -> s2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers javaUtilLocaleMembers -> S4
     com.android.tools.r8.graph.DexString intArrayDescriptor -> I
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> J4
     com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> K3
-    com.android.tools.r8.graph.DexType enumUnboxingUtilityType -> l4
-    com.android.tools.r8.graph.DexType doubleType -> k2
-    com.android.tools.r8.graph.DexString enabledFieldName -> f2
+    com.android.tools.r8.graph.DexType charType -> k2
+    com.android.tools.r8.graph.DexType nullValueType -> L5
+    com.android.tools.r8.graph.DexString enumValuesFieldName -> f2
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> s4
     com.android.tools.r8.graph.DexString callableDescriptor -> E1
     com.android.tools.r8.graph.DexString lengthMethodName -> e0
-    com.android.tools.r8.graph.DexType optionalLongType -> C3
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> d4
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> w4
+    com.android.tools.r8.graph.DexType optionalIntType -> C3
+    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> d4
     com.android.tools.r8.graph.DexString unboxIntMethodName -> Z
     com.android.tools.r8.graph.DexString streamDescriptor -> M1
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> D4
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> D5
     com.android.tools.r8.graph.DexString indexOfMethodName -> m0
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> W4
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> U0
     com.android.tools.r8.graph.DexString proxyDescriptor -> v1
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> z5
-    com.android.tools.r8.graph.DexType enumerationType -> u5
-    com.android.tools.r8.graph.DexType collectionsType -> S2
-    com.android.tools.r8.graph.DexType collectionType -> t3
+    com.android.tools.r8.kotlin.Kotlin kotlin -> E4
+    com.android.tools.r8.graph.DexType serializableType -> u5
+    com.android.tools.r8.graph.DexType objectsType -> S2
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> t3
     com.android.tools.r8.graph.DexString longArrayDescriptor -> J
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> X4
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers javaUtilComparatorMembers -> R4
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> m5
-    boolean $assertionsDisabled -> P5
-    com.android.tools.r8.graph.DexType stringType -> K2
-    com.android.tools.r8.graph.DexType serviceLoaderType -> l3
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> k5
-    com.android.tools.r8.graph.DexType invocationHandlerType -> j3
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> m5
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> K2
+    com.android.tools.r8.graph.DexType proxyType -> l3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> k5
+    com.android.tools.r8.graph.DexType methodTypeType -> j3
     com.android.tools.r8.graph.DexString classArrayDescriptor -> e1
-    com.android.tools.r8.graph.DexType charSequenceType -> I2
+    com.android.tools.r8.graph.DexType boxedVoidType -> I2
     com.android.tools.r8.graph.DexString nameMethodName -> D0
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> s
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> s4
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> c5
-    com.android.tools.r8.graph.DexType autoCloseableType -> b3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> c5
+    com.android.tools.r8.graph.DexType methodType -> b3
     com.android.tools.r8.graph.DexString getFieldName -> L0
     com.android.tools.r8.graph.DexString iterableDescriptor -> m1
-    com.android.tools.r8.graph.DexType boxedCharType -> A2
-    com.android.tools.r8.graph.DexType boxedByteType -> z2
-    com.android.tools.r8.graph.DexType javaUtilSetType -> Z3
+    com.android.tools.r8.graph.DexType boxedByteType -> A2
+    com.android.tools.r8.graph.DexType boxedBooleanType -> z2
+    com.android.tools.r8.graph.DexType androidOsBuildType -> Z3
     com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> U1
     com.android.tools.r8.graph.DexString valuesMethodName -> u0
-    com.android.tools.r8.graph.DexType byteArrayType -> r2
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> R3
+    com.android.tools.r8.graph.DexType booleanArrayType -> r2
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> R3
     com.android.tools.r8.graph.DexString shortArrayDescriptor -> K
-    java.util.Set libraryTypesAssumedToBePresent -> J5
-    com.android.tools.r8.graph.DexType charType -> j2
+    java.util.Set libraryClassesWithoutStaticInitialization -> J5
+    com.android.tools.r8.graph.DexType byteType -> j2
+    com.android.tools.r8.graph.DexType enumUnboxingUtilityType -> k4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> d0
     com.android.tools.r8.graph.DexString comparatorDescriptor -> D1
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> J3
-    com.android.tools.r8.graph.DexString enumValuesFieldName -> e2
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> t4
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers javaUtilLocaleMembers -> T4
-    com.android.tools.r8.graph.DexString unknownTypeName -> N5
-    com.android.tools.r8.graph.DexType androidOsBundleType -> c4
+    com.android.tools.r8.graph.DexType throwableType -> J3
+    com.android.tools.r8.graph.DexString thisName -> e2
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> c4
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> l0
-    com.android.tools.r8.graph.DexType optionalIntType -> B3
+    com.android.tools.r8.graph.DexType optionalDoubleType -> B3
     com.android.tools.r8.graph.DexString optionalLongDescriptor -> L1
-    com.android.tools.r8.graph.DexType fieldType -> Z2
+    com.android.tools.r8.graph.DexType classLoaderType -> Z2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> V4
     com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> T0
     com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> u1
-    com.android.tools.r8.graph.DexType objectsType -> R2
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> s3
-    com.android.tools.r8.graph.DexType listIteratorType -> t5
+    com.android.tools.r8.graph.DexType annotationType -> R2
+    com.android.tools.r8.graph.DexType mapEntryType -> s3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> y5
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> W4
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> v4
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> B4
+    com.android.tools.r8.graph.DexType enumerationType -> t5
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> q4
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> L
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> J2
-    com.android.tools.r8.graph.DexType proxyType -> k3
-    com.android.tools.r8.graph.DexType methodTypeType -> i3
-    com.android.tools.r8.graph.DexType boxedVoidType -> H2
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> j5
+    com.android.tools.r8.graph.DexType charSequenceType -> J2
+    com.android.tools.r8.graph.DexType invocationHandlerType -> k3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers javaUtilComparatorMembers -> Q4
+    com.android.tools.r8.graph.DexType methodHandleType -> i3
+    com.android.tools.r8.graph.DexType boxedNumberType -> H2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> j5
     com.android.tools.r8.graph.DexString boxedVoidDescriptor -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
     com.android.tools.r8.graph.DexString getNameName -> G0
     com.android.tools.r8.graph.DexString methodDescriptor -> h1
-    com.android.tools.r8.graph.DexType methodType -> a3
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> b5
+    com.android.tools.r8.graph.DexType fieldType -> a3
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> b5
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> O0
     com.android.tools.r8.graph.DexString stringBuilderDescriptor -> p1
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> Y3
-    com.android.tools.r8.graph.DexType boxedBooleanType -> y2
+    com.android.tools.r8.graph.DexType javaUtilSetType -> Y3
+    com.android.tools.r8.graph.DexType shortArrayType -> y2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> i
     com.android.tools.r8.graph.DexString byteArrayDescriptor -> E
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> y4
     com.android.tools.r8.graph.DexString convertMethodName -> x0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> X1
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> Q3
-    com.android.tools.r8.graph.DexType booleanArrayType -> q2
+    com.android.tools.r8.graph.DexString kotlinMetadataDescriptor -> X1
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> Q3
+    com.android.tools.r8.graph.DexType voidType -> q2
     java.util.Map methodHandles -> g
-    com.android.tools.r8.graph.DexType nestConstructorType -> j4
-    com.android.tools.r8.graph.DexType byteType -> i2
-    com.android.tools.r8.graph.DexType throwableType -> I3
+    java.util.Set libraryMethodsReturningReceiver -> E5
+    com.android.tools.r8.graph.DexType booleanType -> i2
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> I3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> h2
     com.android.tools.r8.graph.DexString consumerDescriptor -> G1
-    com.android.tools.r8.graph.DexString nestConstructorDescriptor -> i4
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString containsMethodName -> g0
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> b4
-    com.android.tools.r8.graph.DexType optionalDoubleType -> A3
+    com.android.tools.r8.graph.DexType androidOsBundleType -> b4
+    com.android.tools.r8.graph.DexItemFactory$DoubleMethods doubleMethods -> u4
+    com.android.tools.r8.graph.DexType optionalType -> A3
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers androidOsBundleMembers -> J4
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers javaUtilLoggingLevelMembers -> T4
     com.android.tools.r8.graph.DexString throwableDescriptor -> O1
     com.android.tools.r8.graph.DexString compareToMethodName -> o0
-    com.android.tools.r8.graph.DexType classLoaderType -> Y2
-    com.android.tools.r8.graph.DexType optionalType -> z3
+    com.android.tools.r8.graph.DexType annotationDefault -> Z4
+    com.android.tools.r8.graph.DexType classType -> Y2
+    com.android.tools.r8.graph.DexType runnableType -> z3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> j
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> Y4
     com.android.tools.r8.graph.DexString charArrayDescriptor -> F
     com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> W0
     com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> x1
-    com.android.tools.r8.graph.DexType iteratorType -> s5
-    com.android.tools.r8.graph.DexType annotationType -> Q2
-    com.android.tools.r8.graph.DexType mapEntryType -> r3
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> C4
-    com.android.tools.r8.graph.DexType boxedNumberType -> G2
-    com.android.tools.r8.graph.DexType annotationThrows -> i5
-    com.android.tools.r8.graph.DexType methodHandleType -> h3
-    java.util.Map libraryMethodsWithoutSideEffects -> H5
+    com.android.tools.r8.graph.DexType listIteratorType -> s5
+    com.android.tools.r8.graph.DexType enumType -> Q2
+    com.android.tools.r8.graph.DexType mapType -> r3
+    com.android.tools.r8.graph.DexType boxedShortType -> G2
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> i5
+    boolean skipNameValidationForTesting -> K5
+    com.android.tools.r8.graph.DexType varHandleType -> h3
     com.android.tools.r8.graph.DexString fieldDescriptor -> g1
     com.android.tools.r8.graph.DexString forNameMethodName -> F0
     com.android.tools.r8.graph.DexString unboxByteMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexType annotationDefault -> a5
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> F4
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> a5
     com.android.tools.r8.graph.DexString getMethodName -> N0
     com.android.tools.r8.graph.DexString strictMathDescriptor -> o1
-    com.android.tools.r8.graph.DexType shortArrayType -> x2
+    com.android.tools.r8.graph.DexType longArrayType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> k
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> X3
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> X3
     com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> W1
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> z4
     com.android.tools.r8.graph.DexString doubleArrayDescriptor -> G
     com.android.tools.r8.graph.DexString internMethodName -> w0
-    com.android.tools.r8.graph.DexType voidType -> p2
-    com.android.tools.r8.graph.DexType javaIoFileType -> P3
-    com.android.tools.r8.graph.DexType booleanType -> h2
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> H3
+    com.android.tools.r8.graph.DexType shortType -> p2
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> P3
+    com.android.tools.r8.graph.DexType intConsumer -> H3
+    com.android.tools.r8.graph.DexString nestConstructorDescriptor -> h4
+    com.android.tools.r8.graph.DexType nestConstructorType -> i4
     com.android.tools.r8.graph.DexString concatMethodName -> f0
     com.android.tools.r8.graph.DexString supplierDescriptor -> F1
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> g2
+    com.android.tools.r8.graph.DexString enabledFieldName -> g2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> X
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers androidOsBundleMembers -> K4
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers javaUtilLoggingLevelMembers -> U4
     com.android.tools.r8.graph.DexString intDescriptor -> y
     java.util.Set possibleCompilerSynthesizedTypes -> a
-    com.android.tools.r8.graph.DexType androidOsBuildType -> a4
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> u4
+    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> a4
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> n0
     com.android.tools.r8.graph.DexString arraysDescriptor -> N1
-    com.android.tools.r8.graph.DexType classType -> X2
-    com.android.tools.r8.graph.DexType runnableType -> y3
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> X2
+    com.android.tools.r8.graph.DexType consumerType -> y3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> l
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> X4
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> V0
     com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> w1
     com.android.tools.r8.graph.DexString floatArrayDescriptor -> H
-    com.android.tools.r8.graph.DexType enumType -> P2
-    com.android.tools.r8.graph.DexType mapType -> q3
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> E4
-    com.android.tools.r8.graph.DexType lookupType -> r5
+    com.android.tools.r8.graph.DexType classArrayType -> P2
+    com.android.tools.r8.graph.DexType setType -> q3
+    com.android.tools.r8.graph.DexType iteratorType -> r5
     1:44:void <clinit>():62:105 -> <clinit>
     1:1:void <init>():109:109 -> <init>
-    2:521:void <init>():67:586 -> <init>
-    522:570:void <init>():576:624 -> <init>
-    571:587:void <init>():614:630 -> <init>
-    588:609:void <init>():627:648 -> <init>
-    610:630:void <init>():639:659 -> <init>
-    631:671:void <init>():652:692 -> <init>
-    672:676:void <init>():691:695 -> <init>
-    677:680:void <init>():694:697 -> <init>
-    681:731:void <init>():683:733 -> <init>
-    732:734:void <init>():110:112 -> <init>
-    735:735:void <init>():111:111 -> <init>
+    2:523:void <init>():67:588 -> <init>
+    524:572:void <init>():578:626 -> <init>
+    573:589:void <init>():616:632 -> <init>
+    590:611:void <init>():629:650 -> <init>
+    612:632:void <init>():641:661 -> <init>
+    633:674:void <init>():654:695 -> <init>
+    675:680:void <init>():693:698 -> <init>
+    681:684:void <init>():696:699 -> <init>
+    685:735:void <init>() -> <init>
+    736:738:void <init>():110:112 -> <init>
+    739:739:void <init>():111:111 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$2(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> a
-    2:13:java.util.Set boxedValueOfMethods():599:610 -> a
-    14:16:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):602:604 -> a
-    17:17:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):702:702 -> a
-    18:18:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):702:702 -> a
-    19:19:void setSkipNameValidationForTesting(boolean):736:736 -> a
-    20:20:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1727:1727 -> a
+    2:13:java.util.Set boxedValueOfMethods():601:612 -> a
+    14:16:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):604:606 -> a
+    17:17:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):704:704 -> a
+    18:18:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):704:704 -> a
+    19:19:void setSkipNameValidationForTesting(boolean):738:738 -> a
+    20:20:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1733:1733 -> a
     21:21:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> a
-    21:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1728 -> a
-    22:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1728:1729 -> a
-    24:24:com.android.tools.r8.graph.DexString createString(int,byte[]):1735:1735 -> a
-    25:25:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1783:1783 -> a
-    26:28:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1787:1789 -> a
-    26:28:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1783 -> a
-    29:33:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):1808:1812 -> a
-    34:35:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1838:1839 -> a
-    36:38: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):1843:1845 -> a
-    39:39:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1849:1849 -> a
-    40:41: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):1854:1855 -> a
-    42:45:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1859:1862 -> a
-    46:51:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1928:1933 -> a
-    46:51:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1863 -> a
-    52:52:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1860:1860 -> a
-    53:53:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1867:1867 -> a
-    54:56:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1871:1873 -> a
-    57:60:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1877:1880 -> a
-    61:63:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1879:1881 -> a
-    64:68:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1894:1898 -> a
-    69:78:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1915:1924 -> a
-    69:78:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1898 -> a
-    79:85:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1899:1905 -> a
-    86:90:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1904:1908 -> a
-    91:93: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):1937:1939 -> a
-    94:94:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1943:1943 -> a
-    95:96:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):1951:1952 -> a
-    97:98: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):1961:1962 -> a
-    99:108: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[]):1970:1979 -> a
-    109:111:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1983:1985 -> a
-    112:114:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2021:2023 -> a
-    115:117:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2028:2030 -> a
-    118:118:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2038:2038 -> a
-    119:126:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2071:2078 -> a
-    127:155:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2077:2105 -> a
-    156:164:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$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.TypeElement,com.android.tools.r8.graph.DexType):2085:2093 -> a
-    165:176:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$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.TypeElement,com.android.tools.r8.graph.DexType):2092:2103 -> a
-    177:177:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2110:2110 -> a
-    178:179:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2113:2114 -> a
-    180:180:void forAllTypes(java.util.function.Consumer):2119:2119 -> a
-    1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):589:590 -> b
-    3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):1739:1740 -> b
-    5:5:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1744:1744 -> b
-    6:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1787:1789 -> b
-    9:9:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):1821:1821 -> b
-    10:12:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1989:1991 -> b
-    13:13:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2034:2034 -> b
-    14:16:void clearTypeElementsCache():2042:2044 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):744:744 -> c
-    2:3:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1796:1797 -> c
-    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):1817:1817 -> c
-    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1826:1826 -> c
-    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1995:1997 -> c
-    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2013:2013 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1767:1775 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1772:1772 -> d
+    21:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1734 -> a
+    22:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1734:1735 -> a
+    24:24:com.android.tools.r8.graph.DexString createString(int,byte[]):1741:1741 -> a
+    25:25:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1789:1789 -> a
+    26:28:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1793:1795 -> a
+    26:28:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1789 -> a
+    29:33:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):1814:1818 -> a
+    34:35:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1844:1845 -> a
+    36:38: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):1849:1851 -> a
+    39:39:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1855:1855 -> a
+    40:41: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):1860:1861 -> a
+    42:45:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1865:1868 -> a
+    46:51:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1934:1939 -> a
+    46:51:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1869 -> a
+    52:52:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1866:1866 -> a
+    53:53:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1873:1873 -> a
+    54:56:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1877:1879 -> a
+    57:60:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1883:1886 -> a
+    61:63:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1885:1887 -> a
+    64:68:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1900:1904 -> a
+    69:78:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1921:1930 -> a
+    69:78:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1904 -> a
+    79:85:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1905:1911 -> a
+    86:90:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1910:1914 -> a
+    91:93: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):1943:1945 -> a
+    94:94:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1949:1949 -> a
+    95:96:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):1957:1958 -> a
+    97:98: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):1967:1968 -> a
+    99:108: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[]):1976:1985 -> a
+    109:111:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1989:1991 -> a
+    112:114:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2027:2029 -> a
+    115:117:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2034:2036 -> a
+    118:118:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2044:2044 -> a
+    119:126:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2077:2084 -> a
+    127:155:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2083:2111 -> a
+    156:164:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$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.TypeElement,com.android.tools.r8.graph.DexType):2091:2099 -> a
+    165:176:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$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.TypeElement,com.android.tools.r8.graph.DexType):2098:2109 -> a
+    177:177:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2116:2116 -> a
+    178:179:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2119:2120 -> a
+    180:180:void forAllTypes(java.util.function.Consumer):2125:2125 -> a
+    1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):591:592 -> b
+    3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):1745:1746 -> b
+    5:5:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1750:1750 -> b
+    6:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1793:1795 -> b
+    9:9:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):1827:1827 -> b
+    10:12:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1995:1997 -> b
+    13:13:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2040:2040 -> b
+    14:16:void clearTypeElementsCache():2048:2050 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):746:746 -> c
+    2:3:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1802:1803 -> c
+    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):1823:1823 -> c
+    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1832:1832 -> c
+    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2001:2003 -> c
+    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2019:2019 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1773:1781 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1778:1778 -> d
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):116:116 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1776 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1776:1777 -> d
-    14:14:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1804:1804 -> d
-    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1830:1830 -> d
-    16:18:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2001:2003 -> d
-    19:19:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2017:2017 -> d
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1748:1748 -> e
-    2:6:java.util.List extractMarkers():1755:1759 -> e
-    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1834:1834 -> e
-    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2007:2009 -> e
-    1:1:boolean getSkipNameValidationForTesting():740:740 -> f
-    1:3:boolean verifyNoCachedTypeElements():2048:2050 -> g
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.Y$a:
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.Y$b:
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1782 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1782:1783 -> d
+    14:14:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1810:1810 -> d
+    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1836:1836 -> d
+    16:18:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2007:2009 -> d
+    19:19:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2023:2023 -> d
+    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1754:1754 -> e
+    2:6:java.util.List extractMarkers():1761:1765 -> e
+    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1840:1840 -> e
+    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2013:2015 -> e
+    1:1:boolean getSkipNameValidationForTesting():742:742 -> f
+    1:3:boolean verifyNoCachedTypeElements():2054:2056 -> g
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.Z$a:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.Z$b:
     com.android.tools.r8.graph.DexField TYPE -> q
     com.android.tools.r8.graph.DexField SUPPORTED_64_BIT_ABIS -> n
     com.android.tools.r8.graph.DexField SUPPORTED_32_BIT_ABIS -> m
@@ -17778,63 +17931,63 @@
     com.android.tools.r8.graph.DexField BOOTLOADER -> a
     com.android.tools.r8.graph.DexField CPU_ABI2 -> d
     com.android.tools.r8.graph.DexField CPU_ABI -> c
-    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):773:795 -> <init>
-    1:17:void forEachFinalField(java.util.function.Consumer):799:815 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.Y$c:
+    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):775:797 -> <init>
+    1:17:void forEachFinalField(java.util.function.Consumer):801:817 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.Z$c:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
     com.android.tools.r8.graph.DexField RELEASE -> b
     com.android.tools.r8.graph.DexField CODENAME -> a
     com.android.tools.r8.graph.DexField SDK_INT -> d
     com.android.tools.r8.graph.DexField SDK -> c
-    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):819:826 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):830:834 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.Y$d:
+    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):821:828 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):832:836 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.Z$d:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField EMPTY -> b
     com.android.tools.r8.graph.DexField CREATOR -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):838:842 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):846:847 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.Y$e:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):840:844 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):848:849 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.Z$e:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField S_IXUSR -> b
     com.android.tools.r8.graph.DexField S_IRUSR -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):851:854 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):858:859 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.Y$f:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):853:856 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):860:861 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.Z$f:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
     com.android.tools.r8.graph.DexField EMPTY_STATE_SET -> b
     com.android.tools.r8.graph.DexField TRANSLATION_Z -> a
     com.android.tools.r8.graph.DexField PRESSED_ENABLED_STATE_SET -> d
     com.android.tools.r8.graph.DexField ENABLED_STATE_SET -> c
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):863:874 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):878:882 -> a
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.Y$g:
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):865:876 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):880:884 -> a
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.Z$g:
     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):1098:1098 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1102:1107 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.Y$h:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1100:1100 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1104:1109 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.Z$h:
     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):1390:1390 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1396:1415 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1419:1419 -> a
-com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.Y$i:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1396:1396 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1402:1421 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1425:1425 -> a
+com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.Z$i:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField TRUE -> b
     com.android.tools.r8.graph.DexField FALSE -> a
     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):752:752 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):763:763 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):754:761 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):767:769 -> a
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.Y$j:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):754:754 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):765:765 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):756:763 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):769:771 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.Z$j:
     com.android.tools.r8.graph.DexMethod newInstance -> m
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
     com.android.tools.r8.graph.DexMethod getMethod -> k
@@ -17850,84 +18003,84 @@
     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):1175:1175 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):1193:1232 -> <init>
-    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$ClassMethods):1175:1175 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1236:1236 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1240:1240 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1244:1244 -> c
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.Y$k:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1177:1177 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):1195:1234 -> <init>
+    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$ClassMethods):1177:1177 -> a
+    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1238:1238 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1242:1242 -> b
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1246:1246 -> c
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.Z$k:
     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):1248:1248 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1252:1254 -> <init>
-com.android.tools.r8.graph.DexItemFactory$DoubleMethods -> com.android.tools.r8.graph.Y$l:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1250:1250 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1254:1256 -> <init>
+com.android.tools.r8.graph.DexItemFactory$DoubleMethods -> com.android.tools.r8.graph.Z$l:
     com.android.tools.r8.graph.DexMethod isNaN -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1051:1051 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1055:1059 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1057:1057 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.Y$m:
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.graph.DexItemFactory this$0 -> h
-    com.android.tools.r8.graph.DexMethod finalize -> g
-    com.android.tools.r8.graph.DexMethod constructor -> f
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1053:1053 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1057:1061 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1059:1059 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.Z$m:
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.DexMethod finalize -> h
+    com.android.tools.r8.graph.DexItemFactory this$0 -> i
+    com.android.tools.r8.graph.DexMethod constructor -> g
+    com.android.tools.r8.graph.DexMethod equals -> f
     com.android.tools.r8.graph.DexMethod compareTo -> e
     com.android.tools.r8.graph.DexMethod toString -> d
     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 <clinit>():1262:1262 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1262:1262 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1275:1275 -> <init>
-    3:34:void <init>(com.android.tools.r8.graph.DexItemFactory):1270:1301 -> <init>
-    1:4:boolean isValueOfMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1317:1320 -> a
-    1:4:boolean isValuesMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1309:1312 -> b
-com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.Y$n:
+    1:1:void <clinit>():1264:1264 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1264:1264 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1278:1278 -> <init>
+    3:37:void <init>(com.android.tools.r8.graph.DexItemFactory):1273:1307 -> <init>
+    1:4:boolean isValuesMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1315:1318 -> a
+com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.Z$n:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):886:886 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):890:890 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):894:894 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.Y$o:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):888:888 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):892:892 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):890:890 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):896:896 -> a
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.Z$o:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1334:1338 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1337:1337 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.Y$p:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1340:1344 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1343:1343 -> <init>
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.Z$p:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):1065:1067 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1071:1071 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.Y$q:
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):1067:1069 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1073:1073 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.Z$q:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField separator -> b
     com.android.tools.r8.graph.DexField pathSeparator -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):898:901 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):905:906 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.Y$r:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):900:903 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):907:908 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.Z$r:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField ZERO -> b
     com.android.tools.r8.graph.DexField ONE -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):910:914 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):918:919 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.Y$s:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):912:916 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):920:921 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.Z$s:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField BIG_ENDIAN -> b
     com.android.tools.r8.graph.DexField LITTLE_ENDIAN -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):923:928 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):932:933 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.Y$t:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):925:930 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):934:935 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.Z$t:
     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):937:937 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):941:945 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):943:943 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.Y$u:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):939:939 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):943:947 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):945:945 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.Z$u:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField EMPTY_SET -> b
     com.android.tools.r8.graph.DexField EMPTY_LIST -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):951:956 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):960:961 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.Y$v:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):953:958 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):962:963 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.Z$v:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexItemFactory this$0 -> h
@@ -17936,16 +18089,16 @@
     com.android.tools.r8.graph.DexField DAYS -> a
     com.android.tools.r8.graph.DexField MILLISECONDS -> d
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
-    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):965:980 -> <init>
-    1:7:void forEachFinalField(java.util.function.Consumer):984:990 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.Y$w:
+    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):967:982 -> <init>
+    1:7:void forEachFinalField(java.util.function.Consumer):986:992 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.Z$w:
     com.android.tools.r8.graph.DexItemFactory this$0 -> d
     com.android.tools.r8.graph.DexField ROOT -> b
     com.android.tools.r8.graph.DexField ENGLISH -> a
     com.android.tools.r8.graph.DexField US -> c
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):994:998 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):1002:1004 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.Y$x:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):996:1000 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):1004:1006 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.Z$x:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -17953,24 +18106,24 @@
     com.android.tools.r8.graph.DexField CONFIG -> a
     com.android.tools.r8.graph.DexField FINEST -> d
     com.android.tools.r8.graph.DexField FINER -> c
-    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1008:1021 -> <init>
-    1:6:void forEachFinalField(java.util.function.Consumer):1025:1030 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.Y$y:
+    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1010:1023 -> <init>
+    1:6:void forEachFinalField(java.util.function.Consumer):1027:1032 -> a
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.Z$y:
     void forEachFinalField(java.util.function.Consumer) -> a
-com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.Y$z:
+com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.Z$z:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1034:1034 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1040:1040 -> <init>
-    3:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1036:1042 -> <init>
-    10:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1041:1041 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1047:1047 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.Y$A:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1036:1036 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1042:1042 -> <init>
+    3:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1038:1044 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1043:1043 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1049:1049 -> a
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.Z$A:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexMethod initWithMessage -> b
     com.android.tools.r8.graph.DexMethod init -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1326:1331 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.Y$B:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1332:1337 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.Z$B:
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
     com.android.tools.r8.graph.DexField clinitField -> a
     com.android.tools.r8.graph.DexMethod toString -> f
@@ -17978,19 +18131,19 @@
     com.android.tools.r8.graph.DexMethod constructor -> d
     com.android.tools.r8.graph.DexMethod getClass -> c
     com.android.tools.r8.graph.DexMethod clone -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1112:1112 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1127:1127 -> <init>
-    3:20:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1136 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.Y$C:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1114:1114 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1129:1129 -> <init>
+    3:20:void <init>(com.android.tools.r8.graph.DexItemFactory):1121:1138 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.Z$C:
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessageSupplier -> c
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessage -> b
     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):1141:1141 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1147:1154 -> <init>
-    10:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1152:1159 -> <init>
-    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1157:1157 -> <init>
-    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1164:1164 -> a
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.Y$D:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1143:1143 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1149:1156 -> <init>
+    10:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1154:1161 -> <init>
+    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1159:1159 -> <init>
+    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1166:1166 -> a
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.Z$D:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -17998,10 +18151,10 @@
     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):1615:1650 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1658:1668 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1675:1680 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.Y$E:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1621:1656 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1664:1674 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1681:1686 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.Z$E:
     com.android.tools.r8.graph.DexField floatTYPE -> f
     com.android.tools.r8.graph.DexField longTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> g
@@ -18010,25 +18163,25 @@
     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):1347:1347 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1359:1378 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1382:1382 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.Y$F:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1353:1353 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1365:1384 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1388:1388 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.Z$F:
     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):1684:1684 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1688:1693 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1690:1690 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.Y$G:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1690:1690 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1694:1699 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1696:1696 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.Z$G:
     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):1697:1697 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1704:1710 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1708:1716 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1713:1718 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1722:1722 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.Y$H:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1703:1703 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1710:1716 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1714:1722 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1719:1724 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1728:1728 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.Z$H:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
@@ -18050,14 +18203,14 @@
     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>():1507:1507 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1507:1507 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1531:1575 -> <init>
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1507:1507 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1580:1580 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1584:1610 -> a
-    1:1:java.util.Set access$2000(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1507:1507 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.Y$I:
+    1:1:void <clinit>():1513:1513 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1513:1513 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1537:1581 -> <init>
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1513:1513 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1586:1586 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1590:1616 -> a
+    1:1:java.util.Set access$2000(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1513:1513 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.Z$I:
     com.android.tools.r8.graph.DexMethod compareTo -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> n
     com.android.tools.r8.graph.DexMethod lastIndexOfInt -> m
@@ -18080,21 +18233,21 @@
     com.android.tools.r8.graph.DexMethod valueOf -> r
     com.android.tools.r8.graph.DexMethod hashCode -> q
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1423:1423 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1453:1453 -> <init>
-    3:75:void <init>(com.android.tools.r8.graph.DexItemFactory):1425:1497 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1503:1503 -> a
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.Y$J:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1429:1429 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1459:1459 -> <init>
+    3:75:void <init>(com.android.tools.r8.graph.DexItemFactory):1431:1503 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1509:1509 -> a
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.Z$J:
     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):1075:1075 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1082:1084 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1083:1086 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1085:1092 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1090:1090 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.Z:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1077:1077 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1084:1086 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1085:1088 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1087:1094 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1092:1092 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.a0:
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():17:17 -> <clinit>
     1:27:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):37:63 -> <init>
@@ -18105,23 +18258,23 @@
     4:4:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):82:82 -> collectIndexedItems
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> d
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():143:143 -> d
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():147:147 -> d
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> d
     3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> d
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> d
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> d
     4:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):75 -> d
     5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):75:75 -> d
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
     1:1:java.lang.String toSourceString():92:92 -> toSourceString
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.a0:
+com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.b0:
     com.android.tools.r8.graph.DexType holder -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():6:6 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexType):11:13 -> <init>
     com.android.tools.r8.graph.DexMember asDexMember() -> b
     boolean isDexMember() -> f
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.b0:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.c0:
     com.android.tools.r8.graph.DexItem annotations -> b
     com.android.tools.r8.graph.DexMember item -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -18129,47 +18282,49 @@
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> collectMixedSectionItems
     1:3:boolean equals(java.lang.Object):41:43 -> equals
     1:1:int hashCode():33:33 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.b0$a:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.c0$a:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):51:51 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.b0$b:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.c0$b:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):58:58 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.b0$c:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.c0$c:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
-com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.c0:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.d0:
     com.android.tools.r8.graph.DexProto proto -> d
     com.android.tools.r8.graph.DexString name -> e
     1:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,boolean):21:26 -> <init>
     1:1:int slowCompareTo(java.lang.Object):15:15 -> a
     2:2:int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15:15 -> a
-    3:4:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:67 -> a
+    3:4:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:68 -> a
     5:157:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:152 -> a
-    5:157:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
+    5:157:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68 -> a
     158:403:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> a
     158:403:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):153 -> a
-    158:403:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
-    404:404:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
-    405:405:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):81:81 -> a
-    406:414:int slowCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):135:143 -> a
-    415:415:boolean match(com.android.tools.r8.graph.DexMethod):148:148 -> a
-    416:427:java.lang.String toSourceString(boolean):175:186 -> a
-    1:9:int slowCompareTo(com.android.tools.r8.graph.DexMethod):122:130 -> b
+    158:403:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68 -> a
+    404:404:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):69:69 -> a
+    405:405:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):82:82 -> a
+    406:414:int slowCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):136:144 -> a
+    415:415:boolean match(com.android.tools.r8.graph.DexMethod):149:149 -> a
+    416:427:java.lang.String toSourceString(boolean):176:187 -> a
+    1:9:int slowCompareTo(com.android.tools.r8.graph.DexMethod):123:131 -> b
     com.android.tools.r8.graph.DexMethod asDexMethod() -> c
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> collectIndexedItems
-    2:2:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76:76 -> collectIndexedItems
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> collectIndexedItems
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> collectIndexedItems
+    2:2:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77:77 -> collectIndexedItems
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> collectIndexedItems
     3:248:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
-    3:248:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76 -> collectIndexedItems
-    3:248:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> collectIndexedItems
-    1:5:boolean computeEquals(java.lang.Object):103:107 -> computeEquals
-    1:3:int computeHashCode():96:98 -> computeHashCode
+    3:248:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77 -> collectIndexedItems
+    3:248:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> collectIndexedItems
+    1:5:boolean computeEquals(java.lang.Object):104:108 -> computeEquals
+    1:3:int computeHashCode():97:99 -> computeHashCode
     boolean isDexMethod() -> g
-    1:1:int getArity():53:53 -> i
-    1:1:java.lang.String qualifiedName():157:157 -> j
-    1:1:java.lang.String toSourceStringWithoutHolder():171:171 -> k
-    1:1:java.lang.String toSmaliString():162:162 -> toSmaliString
-    1:1:java.lang.String toSourceString():167:167 -> toSourceString
+    1:12:com.android.tools.r8.references.MethodReference asMethodReference():37:48 -> i
+    13:13:com.android.tools.r8.references.MethodReference asMethodReference():46:46 -> i
+    1:1:int getArity():54:54 -> j
+    1:1:java.lang.String qualifiedName():158:158 -> k
+    1:1:java.lang.String toSourceStringWithoutHolder():172:172 -> l
+    1:1:java.lang.String toSmaliString():163:163 -> toSmaliString
+    1:1:java.lang.String toSourceString():168:168 -> toSourceString
     1:1:java.lang.String toString():33:33 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.d0:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.e0:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> b
     com.android.tools.r8.graph.DexMember fieldOrMethod -> c
     boolean $assertionsDisabled -> f
@@ -18255,17 +18410,17 @@
     130:260:boolean isStaticHandle():301 -> c
     261:261:boolean isStaticHandle():301:301 -> c
     1:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:273 -> collectIndexedItems
-    9:85:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:76 -> collectIndexedItems
-    9:85:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> collectIndexedItems
-    86:331:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
-    86:331:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76 -> collectIndexedItems
-    86:331:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> collectIndexedItems
-    332:332:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> collectIndexedItems
+    9:86:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:77 -> collectIndexedItems
+    9:86:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> collectIndexedItems
+    87:332:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
+    87:332:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77 -> collectIndexedItems
+    87:332:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> collectIndexedItems
+    333:333:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> collectIndexedItems
     1:6:boolean computeEquals(java.lang.Object):243:248 -> computeEquals
     1:1:int computeHashCode():238:238 -> computeHashCode
     1:1:java.lang.String toSmaliString():289:289 -> toSmaliString
     1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.d0$a:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.e0$a:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -18321,7 +18476,7 @@
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> i
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> i
     1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> j
-com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.e0:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.f0:
     java.util.Collection synthesizedFrom -> s
     com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> w
     com.android.tools.r8.kotlin.KotlinClassLevelInfo kotlinInfo -> u
@@ -18334,135 +18489,135 @@
     2:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):69:69 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):111:111 -> <init>
     4:92:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,java.util.Collection):45:133 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():336:336 -> C
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():347:347 -> C
     boolean isNotProgramClass() -> Y
-    1:642:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:641 -> a
-    1:642:void lambda$addDependencies$6(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):275 -> a
-    643:643:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):152:152 -> a
-    644:644:void lambda$forEachProgramDirectMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):153:153 -> a
-    645:645:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$3(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> a
-    646:646:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):196:196 -> a
-    647:648:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):201:202 -> a
-    649:651:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$4(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):204:206 -> a
-    652:652:void lambda$collectIndexedItems$5(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexEncodedMethod):243:243 -> a
-    653:658:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):270:275 -> a
-    659:659:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):70:70 -> a
-    659:659:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):275 -> a
-    660:664:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):276:280 -> a
-    665:716:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:51 -> a
-    665:716:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):281 -> a
-    717:717:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):326:326 -> a
-    718:720:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):340:342 -> a
-    721:724:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):383:386 -> a
-    725:725:int lambda$computeStaticValuesArray$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):396:396 -> a
-    726:728:boolean hasNonDefaultStaticFieldValues():414:416 -> a
-    726:728:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):392 -> a
-    729:743:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):395:409 -> a
-    744:744:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):432:432 -> a
-    745:745:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):475:475 -> a
+    1:639:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:638 -> a
+    1:639:void lambda$addDependencies$6(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):286 -> a
+    640:640:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):152:152 -> a
+    641:641:void lambda$forEachProgramDirectMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):153:153 -> a
+    642:642:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$3(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
+    643:643:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):207:207 -> a
+    644:645:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):212:213 -> a
+    646:648:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$4(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):215:217 -> a
+    649:649:void lambda$collectIndexedItems$5(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexEncodedMethod):254:254 -> a
+    650:655:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):281:286 -> a
+    656:656:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> a
+    656:656:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):286 -> a
+    657:661:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):287:291 -> a
+    662:713:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:51 -> a
+    662:713:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):292 -> a
+    714:714:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):337:337 -> a
+    715:717:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):351:353 -> a
+    718:721:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):394:397 -> a
+    722:722:int lambda$computeStaticValuesArray$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):407:407 -> a
+    723:725:boolean hasNonDefaultStaticFieldValues():425:427 -> a
+    723:725:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):403 -> a
+    726:740:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):406:420 -> a
+    741:741:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> a
+    742:742:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):486:486 -> a
     1:1:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):142:142 -> b
     2:2:void lambda$forEachProgramMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):143:143 -> b
     3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):175:175 -> b
-    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):191:191 -> b
-    5:5:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):424:424 -> b
-    6:7:void setInitialClassFileVersion(int):441:442 -> b
-    8:10:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):463:465 -> b
-    11:11:java.util.Iterator lambda$asProgramClasses$8(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):476:476 -> b
-    12:12:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):513:513 -> b
+    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):202:202 -> b
+    5:5:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):435:435 -> b
+    6:7:void setInitialClassFileVersion(int):452:453 -> b
+    8:10:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):474:476 -> b
+    11:11:java.util.Iterator lambda$asProgramClasses$8(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):487:487 -> b
+    12:12:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):524:524 -> b
     1:1:void forEachProgramDirectMethod(java.util.function.Consumer):147:147 -> c
     2:2:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):162:162 -> c
     3:3:void lambda$forEachProgramVirtualMethodMatching$2(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):163:163 -> c
-    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> c
-    7:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):428:428 -> c
-    8:8:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):508:508 -> c
+    4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):382:384 -> c
+    7:7:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):439:439 -> c
+    8:8:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):519:519 -> c
     9:9:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
-    9:9:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):508 -> c
-    10:10:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):508:508 -> c
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):220:221 -> collectIndexedItems
+    9:9:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):519 -> c
+    10:10:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):519:519 -> c
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:232 -> collectIndexedItems
     3:155:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:152 -> collectIndexedItems
-    3:155:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):221 -> collectIndexedItems
+    3:155:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):232 -> collectIndexedItems
     156:401:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
     156:401:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):153 -> collectIndexedItems
-    156:401:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):221 -> collectIndexedItems
-    402:402:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):222:222 -> collectIndexedItems
+    156:401:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):232 -> collectIndexedItems
+    402:402:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):233:233 -> collectIndexedItems
     403:405:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):150:152 -> collectIndexedItems
-    403:405:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):223 -> collectIndexedItems
+    403:405:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):234 -> collectIndexedItems
     406:651:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
     406:651:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):153 -> collectIndexedItems
-    406:651:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):223 -> collectIndexedItems
-    652:654:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):225:227 -> collectIndexedItems
+    406:651:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):234 -> collectIndexedItems
+    652:654:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):236:238 -> collectIndexedItems
     655:655:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):245:245 -> collectIndexedItems
-    655:655:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):228 -> collectIndexedItems
-    656:656:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):230:230 -> collectIndexedItems
+    655:655:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):239 -> collectIndexedItems
+    656:656:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):241:241 -> collectIndexedItems
     657:657:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):83:83 -> collectIndexedItems
-    657:657:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):230 -> collectIndexedItems
-    658:667:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:240 -> collectIndexedItems
-    668:670:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):250:252 -> collectIndexedItems
-    668:670:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):240 -> collectIndexedItems
-    671:671:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):241:241 -> collectIndexedItems
-    672:674:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):250:252 -> collectIndexedItems
-    672:674:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):241 -> collectIndexedItems
-    675:676:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):242:243 -> collectIndexedItems
-    677:677:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):70:70 -> collectIndexedItems
-    677:677:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):243 -> collectIndexedItems
-    678:678:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):244:244 -> collectIndexedItems
-    679:679:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):252:252 -> collectIndexedItems
-    679:679:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):241 -> collectIndexedItems
-    680:680:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):252:252 -> collectIndexedItems
-    680:680:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):240 -> collectIndexedItems
-    1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):261:264 -> collectMixedSectionItems
+    657:657:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):241 -> collectIndexedItems
+    658:667:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):242:251 -> collectIndexedItems
+    668:670:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):261:263 -> collectIndexedItems
+    668:670:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):251 -> collectIndexedItems
+    671:671:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):252:252 -> collectIndexedItems
+    672:674:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):261:263 -> collectIndexedItems
+    672:674:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):252 -> collectIndexedItems
+    675:676:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):253:254 -> collectIndexedItems
+    677:677:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> collectIndexedItems
+    677:677:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):254 -> collectIndexedItems
+    678:678:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):255:255 -> collectIndexedItems
+    679:679:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):263:263 -> collectIndexedItems
+    679:679:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):252 -> collectIndexedItems
+    680:680:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):263:263 -> collectIndexedItems
+    680:680:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):251 -> collectIndexedItems
+    1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):272:275 -> collectMixedSectionItems
     1:1:void forEachProgramMethod(java.util.function.Consumer):137:137 -> d
-    2:2:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):184:184 -> d
-    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():464:464 -> d
-    3:3:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):301 -> d
-    4:10:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):304:310 -> d
+    2:2:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):195:195 -> d
+    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():469:469 -> d
+    3:3:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):312 -> d
+    4:10:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):315:321 -> d
     1:1:void forEachProgramVirtualMethod(java.util.function.Consumer):157:157 -> e
-    2:2:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):179:179 -> e
-    1:1:long getChecksum():517:517 -> e0
+    2:2:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):183:183 -> e
+    1:1:long getChecksum():528:528 -> e0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> f
-    1:2:int getInitialClassFileVersion():450:451 -> f0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getClassInitializer():533:533 -> g0
+    1:2:int getInitialClassFileVersion():461:462 -> f0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getClassInitializer():538:538 -> g0
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():167 -> g0
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():167:167 -> g0
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():171:171 -> h0
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):175:175 -> h0
     2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():171 -> h0
-    1:1:java.util.Collection getSynthesizedFrom():256:256 -> i0
-    1:1:boolean hasAnnotations():358:358 -> j0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):377:378 -> j0
-    2:3:boolean hasAnnotations():359 -> j0
-    4:6:boolean hasAnnotations():359:361 -> j0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):379:379 -> j0
-    7:7:boolean hasAnnotations():359 -> j0
-    1:1:boolean hasClassFileVersion():446:446 -> k0
+    1:1:java.util.Collection getSynthesizedFrom():267:267 -> i0
+    1:1:boolean hasAnnotations():369:369 -> j0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):388:389 -> j0
+    2:3:boolean hasAnnotations():370 -> j0
+    4:6:boolean hasAnnotations():370:372 -> j0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):390:390 -> j0
+    7:7:boolean hasAnnotations():370 -> j0
+    1:1:boolean hasClassFileVersion():457:457 -> k0
     boolean isProgramClass() -> l
-    1:1:boolean hasMethods():350:350 -> l0
-    1:1:boolean hasMethodsOrFields():354 -> l0
-    2:2:boolean hasFields():346:346 -> l0
-    2:2:boolean hasMethodsOrFields():354 -> l0
-    1:1:boolean hasOnlyInternalizableAnnotations():365:365 -> m0
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):377:378 -> m0
-    2:3:boolean hasOnlyInternalizableAnnotations():365 -> m0
-    4:6:boolean hasOnlyInternalizableAnnotations():365:367 -> m0
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):379:379 -> m0
-    7:7:boolean hasOnlyInternalizableAnnotations():365 -> m0
-    1:1:boolean originatesFromClassResource():214:214 -> n0
-    1:1:boolean originatesFromDexResource():210:210 -> o0
-    1:1:java.lang.String toSourceString():292:292 -> toSourceString
-    1:1:java.lang.String toString():287:287 -> toString
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.e0$a:
+    1:1:boolean hasMethods():361:361 -> l0
+    1:1:boolean hasMethodsOrFields():365 -> l0
+    2:2:boolean hasFields():357:357 -> l0
+    2:2:boolean hasMethodsOrFields():365 -> l0
+    1:1:boolean hasOnlyInternalizableAnnotations():376:376 -> m0
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):388:389 -> m0
+    2:3:boolean hasOnlyInternalizableAnnotations():376 -> m0
+    4:6:boolean hasOnlyInternalizableAnnotations():376:378 -> m0
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):390:390 -> m0
+    7:7:boolean hasOnlyInternalizableAnnotations():376 -> m0
+    1:1:boolean originatesFromClassResource():225:225 -> n0
+    1:1:boolean originatesFromDexResource():221:221 -> o0
+    1:1:java.lang.String toSourceString():303:303 -> toSourceString
+    1:1:java.lang.String toString():298:298 -> toString
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.f0$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     java.lang.Iterable val$types -> c
     com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> d
-    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):476:480 -> <init>
-    1:1:boolean hasNext():484:484 -> hasNext
-    1:5:com.android.tools.r8.graph.DexProgramClass findNext():495:499 -> k
-    1:2:com.android.tools.r8.graph.DexProgramClass next():489:490 -> next
-    1:2:java.lang.Object next():476 -> next
-com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.e0$b:
+    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):487:491 -> <init>
+    1:1:boolean hasNext():495:495 -> hasNext
+    1:5:com.android.tools.r8.graph.DexProgramClass findNext():506:510 -> k
+    1:2:com.android.tools.r8.graph.DexProgramClass next():500:501 -> next
+    1:2:java.lang.Object next():487 -> next
+com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.f0$b:
     long getChecksum(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.f0:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexTypeList parameters -> d
     com.android.tools.r8.graph.DexString shorty -> b
     com.android.tools.r8.graph.DexProto SENTINEL -> e
@@ -18494,7 +18649,7 @@
     1:1:java.lang.String toDescriptorString():89:89 -> toSmaliString
     1:1:java.lang.String toSmaliString():85 -> toSmaliString
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.g0:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.h0:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.graph.DexField asDexField() -> a
@@ -18508,7 +18663,7 @@
     boolean isDexMember() -> f
     boolean isDexMethod() -> g
     boolean isDexType() -> h
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.i0:
     boolean $assertionsDisabled -> e
     int size -> b
     byte[] content -> c
@@ -18561,7 +18716,7 @@
     1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():36:36 -> g
     1:3:java.lang.String toASCIIString():100:102 -> h
     1:3:java.lang.String toString():92:94 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.h0$a:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.i0$a:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -18570,7 +18725,7 @@
     1:24:char nextChar():42:65 -> a
     25:25:char nextChar():43:43 -> a
     1:1:boolean hasNext():70:70 -> hasNext
-com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.i0:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.j0:
     com.android.tools.r8.graph.DexString descriptor -> b
     java.util.List OLD_SYNTHESIZED_NAMES -> e
     boolean $assertionsDisabled -> f
@@ -18587,13 +18742,13 @@
     1:1:int slowCompareTo(java.lang.Object):37:37 -> a
     2:2:int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):37:37 -> a
     3:3:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):89:89 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     4:4:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):90 -> a
     5:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):90:97 -> a
     13:13:boolean isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> a
     14:14:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):165:165 -> a
     15:17:int slowCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):185:187 -> a
-    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     18:18:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):72 -> a
     19:19:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):73:73 -> a
     20:22:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):357:359 -> a
@@ -18635,7 +18790,7 @@
     1:1:boolean isPrimitiveType():191:191 -> x
     1:2:boolean isReferenceType():241:242 -> y
     1:1:boolean isVoidType():195:195 -> z
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.j0:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.k0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -18655,7 +18810,7 @@
     1:2:boolean equals(java.lang.Object):59:60 -> equals
     1:1:int hashCode():38:38 -> hashCode
     1:8:java.lang.String toString():73:80 -> toString
-com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.k0:
+com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.l0:
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:1:void <clinit>():106:106 -> <clinit>
     1:1:void <init>():30:30 -> <init>
@@ -18713,20 +18868,21 @@
     boolean isDexValueArray() -> x
     boolean isDexValueBoolean() -> y
     boolean isDexValueByte() -> z
-com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.k0$a:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.k0$b:
+com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.l0$a:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.l0$b:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():1146:1146 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1151:1152 -> <init>
     void sort() -> N
-    com.android.tools.r8.graph.IndexedDexItem getValue() -> O
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():1156:1156 -> P
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():1156:1156 -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1033:1033 -> P
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1146 -> P
     1:1:java.lang.Object asAsmEncodedObject():1171:1171 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1181:1181 -> a
-    3:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1187:1194 -> a
-    11:11:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1204:1204 -> a
-    12:12:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1209:1209 -> a
+    3:12:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1187:1196 -> a
+    13:13:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1204:1204 -> a
+    14:14:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1209:1209 -> a
     1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1059:1059 -> collectIndexedItems
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1146 -> collectIndexedItems
     1:1:boolean equals(java.lang.Object):1146:1146 -> equals
@@ -18735,7 +18891,7 @@
     1:1:java.lang.String toString():1146:1146 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1176:1176 -> u
     boolean isDexItemBasedValueString() -> v
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.k0$c:
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.l0$c:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> b
     1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1475:1476 -> <init>
     1:1:void sort():1528:1528 -> N
@@ -18751,7 +18907,7 @@
     1:1:java.lang.String toString():1550:1550 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1481:1481 -> u
     boolean isDexValueAnnotation() -> w
-com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.k0$d:
+com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.l0$d:
     com.android.tools.r8.graph.DexValue[] values -> b
     1:2:void <init>(com.android.tools.r8.graph.DexValue[]):1383:1384 -> <init>
     1:2:void sort():1433:1434 -> N
@@ -18771,7 +18927,7 @@
     1:1:java.lang.String toString():1457:1457 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1393:1393 -> u
     boolean isDexValueArray() -> x
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.k0$e:
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.l0$e:
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> c
@@ -18795,7 +18951,7 @@
     1:1:java.lang.String toString():1707:1707 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1654:1654 -> u
     boolean isDexValueBoolean() -> y
-com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.k0$f:
+com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.l0$f:
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> c
     byte value -> b
     1:1:void <clinit>():430:430 -> <clinit>
@@ -18816,7 +18972,7 @@
     1:1:java.lang.String toString():502:502 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():448:448 -> u
     boolean isDexValueByte() -> z
-com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.k0$g:
+com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.l0$g:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> c
     char value -> b
     1:1:void <clinit>():596:596 -> <clinit>
@@ -18840,7 +18996,7 @@
     1:1:java.lang.Object getBoxedValue():638:638 -> t
     1:1:java.lang.String toString():670:670 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():613:613 -> u
-com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.k0$h:
+com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.l0$h:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> c
     double value -> b
     1:1:void <clinit>():933:933 -> <clinit>
@@ -18864,7 +19020,7 @@
     1:1:java.lang.Object getBoxedValue():976:976 -> t
     1:1:java.lang.String toString():1015:1015 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():951:951 -> u
-com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.k0$i:
+com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.l0$i:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1316:1316 -> <init>
     void sort() -> N
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
@@ -18879,7 +19035,7 @@
     1:1:java.lang.Object getBoxedValue():1313:1313 -> t
     1:1:java.lang.String toString():1313:1313 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1321:1321 -> u
-com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.k0$j:
+com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.l0$j:
     1:1:void <init>(com.android.tools.r8.graph.DexField):1250:1250 -> <init>
     void sort() -> N
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
@@ -18894,7 +19050,7 @@
     1:1:java.lang.Object getBoxedValue():1247:1247 -> t
     1:1:java.lang.String toString():1247:1247 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1255:1255 -> u
-com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.k0$k:
+com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.l0$k:
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> c
     float value -> b
     1:1:void <clinit>():846:846 -> <clinit>
@@ -18918,7 +19074,7 @@
     1:1:java.lang.Object getBoxedValue():888:888 -> t
     1:1:java.lang.String toString():927:927 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():863:863 -> u
-com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.k0$l:
+com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.l0$l:
     int value -> b
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> c
     1:1:void <clinit>():682:682 -> <clinit>
@@ -18937,7 +19093,7 @@
     1:1:java.lang.Object getBoxedValue():714:714 -> t
     1:1:java.lang.String toString():752:752 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():699:699 -> u
-com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.k0$m:
+com.android.tools.r8.graph.DexValue$DexValueKind -> com.android.tools.r8.graph.l0$m:
     com.android.tools.r8.graph.DexValue$DexValueKind ARRAY -> p
     com.android.tools.r8.graph.DexValue$DexValueKind ANNOTATION -> q
     byte b -> a
@@ -18962,7 +19118,7 @@
     19:19:void <clinit>():32:32 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):97:98 -> <init>
     1:1:byte toByte():102:102 -> a
-com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.k0$n:
+com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.l0$n:
     long value -> b
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> c
     1:1:void <clinit>():764:764 -> <clinit>
@@ -18983,7 +19139,7 @@
     1:1:java.lang.Object getBoxedValue():806:806 -> t
     1:1:java.lang.String toString():834:834 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():781:781 -> u
-com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.k0$o:
+com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.l0$o:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):1283:1283 -> <init>
     void sort() -> N
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
@@ -18992,14 +19148,14 @@
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1280:1280 -> a
     4:4:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1309:1309 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1294:1294 -> collectIndexedItems
-    2:2:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> collectIndexedItems
+    2:2:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60:60 -> collectIndexedItems
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1294 -> collectIndexedItems
-    3:3:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76:76 -> collectIndexedItems
-    3:3:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> collectIndexedItems
+    3:3:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77:77 -> collectIndexedItems
+    3:3:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> collectIndexedItems
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1294 -> collectIndexedItems
     4:249:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):0:245 -> collectIndexedItems
-    4:249:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):76 -> collectIndexedItems
-    4:249:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):60 -> collectIndexedItems
+    4:249:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):77 -> collectIndexedItems
+    4:249:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):61 -> collectIndexedItems
     4:249:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1294 -> collectIndexedItems
     1:1:boolean equals(java.lang.Object):1280:1280 -> equals
     1:1:int hashCode():1280:1280 -> hashCode
@@ -19007,11 +19163,12 @@
     1:1:java.lang.Object getBoxedValue():1280:1280 -> t
     1:1:java.lang.String toString():1280:1280 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1288:1288 -> u
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.k0$p:
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.l0$p:
     1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1720:1720 -> <init>
     boolean isDexValueMethodHandle() -> F
     void sort() -> N
-    com.android.tools.r8.graph.IndexedDexItem getValue() -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1033:1033 -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1717 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1717 -> a
     2:2:java.lang.Object asAsmEncodedObject():1717:1717 -> a
@@ -19024,11 +19181,12 @@
     1:1:java.lang.Object getBoxedValue():1717:1717 -> t
     1:1:java.lang.String toString():1717:1717 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1735:1735 -> u
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.k0$q:
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.l0$q:
     1:1:void <init>(com.android.tools.r8.graph.DexProto):1349:1349 -> <init>
     boolean isDexValueMethodType() -> G
     void sort() -> N
-    com.android.tools.r8.graph.IndexedDexItem getValue() -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1033:1033 -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1346 -> O
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexValue$NestedDexValue.getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1346 -> a
     2:2:java.lang.Object asAsmEncodedObject():1346:1346 -> a
@@ -19041,7 +19199,7 @@
     1:1:java.lang.Object getBoxedValue():1346:1346 -> t
     1:1:java.lang.String toString():1346:1346 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1364:1364 -> u
-com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.k0$r:
+com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.l0$r:
     com.android.tools.r8.graph.DexValue NULL -> b
     1:1:void <clinit>():1556:1556 -> <clinit>
     1:1:void <init>():1559:1559 -> <init>
@@ -19055,7 +19213,7 @@
     1:1:boolean equals(java.lang.Object):1616:1616 -> equals
     java.lang.Object getBoxedValue() -> t
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1568:1568 -> u
-com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.k0$s:
+com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.l0$s:
     1:1:void <init>():408:408 -> <init>
     boolean isDexValueNumber() -> I
     boolean mayHaveSideEffects() -> M
@@ -19063,7 +19221,7 @@
     long getRawValue() -> O
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):424:424 -> a
     com.android.tools.r8.graph.DexValue$DexValueNumber asDexValueNumber() -> p
-com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.k0$t:
+com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.l0$t:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> c
     short value -> b
     1:1:void <clinit>():514:514 -> <clinit>
@@ -19082,12 +19240,13 @@
     1:1:java.lang.Object getBoxedValue():556:556 -> t
     1:1:java.lang.String toString():584:584 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():531:531 -> u
-com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.k0$u:
+com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.l0$u:
     1:1:void <init>(com.android.tools.r8.graph.DexString):1093:1093 -> <init>
     boolean isDexValueString() -> K
     boolean mayHaveSideEffects() -> M
     void sort() -> N
-    com.android.tools.r8.graph.IndexedDexItem getValue() -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1033:1033 -> O
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1090 -> O
     1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1090:1090 -> a
     2:2:java.lang.Object asAsmEncodedObject():1108:1108 -> a
     3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1118:1118 -> a
@@ -19101,7 +19260,7 @@
     1:1:java.lang.Object getBoxedValue():1090:1090 -> t
     1:1:java.lang.String toString():1090:1090 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1113:1113 -> u
-com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.k0$v:
+com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.l0$v:
     1:1:void <init>(com.android.tools.r8.graph.DexType):1217:1217 -> <init>
     boolean isDexValueType() -> L
     void sort() -> N
@@ -19122,12 +19281,11 @@
     1:1:java.lang.Object getBoxedValue():1214:1214 -> t
     1:1:java.lang.String toString():1214:1214 -> toString
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1222:1222 -> u
-com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.k0$w:
+com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.l0$w:
     com.android.tools.r8.graph.IndexedDexItem value -> b
     1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):1019:1019 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):1023:1024 -> <init>
     void sort() -> N
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1033:1033 -> O
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1029:1029 -> a
     2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1038:1039 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
@@ -19141,7 +19299,7 @@
     1:1:int hashCode():1069:1069 -> hashCode
     1:1:java.lang.Object getBoxedValue():1048:1048 -> t
     1:1:java.lang.String toString():1086:1086 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.k0$x:
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.l0$x:
     1:1:void <init>():380:380 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexValue$1):380:380 -> <init>
     1:1:void writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):400:400 -> a
@@ -19153,7 +19311,7 @@
     4:4:void com.android.tools.r8.graph.DexValue.access$100(com.android.tools.r8.graph.DexValue$DexValueKind,int,com.android.tools.r8.dex.DexOutputBuffer):30 -> a
     4:4:void writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):403 -> a
     5:5:void writeIntegerTo(com.android.tools.r8.graph.DexValue$DexValueKind,long,int,com.android.tools.r8.dex.DexOutputBuffer):404:404 -> a
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.m0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
@@ -19201,8 +19359,8 @@
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):133:133 -> l
     5:5:boolean verifyCodeObjectsOwners():197 -> l
     6:14:boolean verifyCodeObjectsOwners():197:205 -> l
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.l0$a:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.l0$b:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.m0$a:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.m0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> l
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> k
     1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):211:211 -> <init>
@@ -19214,7 +19372,7 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):237:237 -> d
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
     1:16:com.android.tools.r8.graph.DirectMappedDexApplication build():259:274 -> f
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.m0:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.n0:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -19229,7 +19387,7 @@
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
     1:4:java.lang.String toString():78:81 -> toString
-com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.graph.q0:
+com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.graph.r0:
     java.util.Map maps -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection$1):13:13 -> <init>
     2:3:void <init>(java.util.Map):21:22 -> <init>
@@ -19243,18 +19401,18 @@
     2:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):26:26 -> b
     1:1:java.util.Set enumSet():38:38 -> c
     1:1:boolean isEmpty():30:30 -> d
-com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.graph.n0:
-com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.graph.p0:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder -> a
     1:1:void <init>():59:59 -> <init>
     1:4:com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder put(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):64:67 -> a
     5:8:com.android.tools.r8.graph.EnumValueInfoMapCollection build():72:75 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.graph.p0:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.graph.q0:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):118:120 -> <init>
     1:1:int convertToInt():124:124 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.graph.q0$a:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.graph.r0$a:
     java.util.LinkedHashMap map -> a
     1:2:void <init>(java.util.LinkedHashMap):83:84 -> <init>
     1:1:int size():88:88 -> a
@@ -19266,7 +19424,7 @@
     10:14:void lambda$rewrittenWithLens$0(java.util.LinkedHashMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):107 -> a
     15:15:void lambda$rewrittenWithLens$0(java.util.LinkedHashMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):107:107 -> a
     1:1:boolean hasEnumValueInfo(com.android.tools.r8.graph.DexField):92:92 -> b
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.r0:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.s0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -19288,97 +19446,137 @@
     1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> h
     3:3:void <init>(int):40:40 -> h
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> h
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.s0:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.t0:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.u0:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.v0:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void <init>():13:16 -> <init>
     1:1:void flattenAccessContexts():20:20 -> a
     2:2:boolean contains(com.android.tools.r8.graph.DexField):25:25 -> a
-    3:4:void extend(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):34:35 -> a
-    5:6:void forEach(java.util.function.Consumer):41:42 -> a
-    7:7:boolean lambda$removeIf$0(java.util.function.BiPredicate,java.util.Map$Entry):47:47 -> a
-    8:8:void removeIf(java.util.function.BiPredicate):47:47 -> a
-    9:9:boolean lambda$restrictToProgram$1(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):52:52 -> a
-    10:10:void restrictToProgram(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
-    11:12:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):57:58 -> a
-    13:15:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):60:60 -> a
+    3:4:com.android.tools.r8.graph.FieldAccessInfoImpl extend(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):34:35 -> a
+    5:6:void forEach(java.util.function.Consumer):42:43 -> a
+    7:7:boolean lambda$removeIf$0(java.util.function.BiPredicate,java.util.Map$Entry):48:48 -> a
+    8:8:void removeIf(java.util.function.BiPredicate):48:48 -> a
+    9:9:boolean lambda$restrictToProgram$1(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):53:53 -> a
+    10:10:void restrictToProgram(com.android.tools.r8.graph.DexDefinitionSupplier):53:53 -> a
+    11:12:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):58:59 -> a
+    13:15:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):61:61 -> a
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):30:30 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):13 -> b
-    2:2:boolean verifyMappingIsOneToOne():68:68 -> b
+    2:2:boolean verifyMappingIsOneToOne():69:69 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):30:30 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.w0:
     java.util.Map readsWithContexts -> c
     java.util.Map writesWithContexts -> d
-    boolean $assertionsDisabled -> i
-    int FLAG_HAS_REFLECTIVE_ACCESS -> h
-    int FLAG_IS_READ_FROM_METHOD_HANDLE -> f
+    boolean $assertionsDisabled -> j
+    int FLAG_IS_WRITTEN_FROM_METHOD_HANDLE -> h
+    int FLAG_HAS_REFLECTIVE_ACCESS -> i
+    int FLAG_IS_READ_FROM_ANNOTATION -> f
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> e
-    int FLAG_IS_WRITTEN_FROM_METHOD_HANDLE -> g
+    int FLAG_IS_READ_FROM_METHOD_HANDLE -> g
     com.android.tools.r8.graph.DexField field -> a
     int flags -> b
-    1:7:void <clinit>():21:27 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexField):43:44 -> <init>
-    1:13:void flattenAccessContexts(java.util.Map):54:66 -> a
-    14:15:void lambda$flattenAccessContexts$1(java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):58:59 -> a
-    16:19:void forEachIndirectAccess(java.util.function.Consumer):115:118 -> a
-    20:20:boolean lambda$forEachIndirectAccess$2(java.util.Set,com.android.tools.r8.graph.DexField):117:117 -> a
-    21:21:void forEachAccessInMap(java.util.Map,java.util.function.Predicate,java.util.function.Consumer):127:127 -> a
-    22:23:void lambda$forEachAccessInMap$4(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexField,java.util.Set):129:130 -> a
-    24:29:void forEachIndirectAccessWithContexts(java.util.function.BiConsumer):139:144 -> a
-    30:30:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):152:152 -> a
-    31:34:void lambda$extendAccessesWithContexts$8(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):154:157 -> a
-    35:35:java.util.Set lambda$extendAccessesWithContexts$7(com.android.tools.r8.graph.DexField):156:156 -> a
-    36:39:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):242:245 -> a
-    40:42:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):277:279 -> a
-    43:48:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):290:295 -> a
-    49:49:void clearReads():308:308 -> a
-    50:66:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):316:332 -> a
-    67:69:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):322:324 -> a
-    70:73:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):323:326 -> a
-    1:1:java.util.Set lambda$flattenAccessContexts$0(com.android.tools.r8.graph.DexField):55:55 -> b
-    2:2:boolean lambda$forEachIndirectAccess$3(java.util.Set,com.android.tools.r8.graph.DexField):119:119 -> b
-    3:3:void forEachWriteContext(java.util.function.Consumer):170:170 -> b
+    1:8:void <clinit>():22:29 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):45:46 -> <init>
+    1:13:void flattenAccessContexts(java.util.Map):56:68 -> a
+    14:15:void lambda$flattenAccessContexts$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):60:61 -> a
+    16:19:void forEachIndirectAccess(java.util.function.Consumer):117:120 -> a
+    20:20:boolean lambda$forEachIndirectAccess$2(java.util.Set,com.android.tools.r8.graph.DexField):119:119 -> a
+    21:21:void forEachAccessInMap(java.util.Map,java.util.function.Predicate,java.util.function.Consumer):129:129 -> a
+    22:23:void lambda$forEachAccessInMap$4(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):131:132 -> a
+    24:29:void forEachIndirectAccessWithContexts(java.util.function.BiConsumer):140:145 -> a
+    30:30:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):153:153 -> a
+    31:34:void lambda$extendAccessesWithContexts$8(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):155:158 -> a
+    35:35:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$extendAccessesWithContexts$7(com.android.tools.r8.graph.DexField):157:157 -> a
+    36:39:boolean isWrittenInMethodSatisfying(java.util.function.Predicate):243:246 -> a
+    40:43:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):278:281 -> a
+    44:49:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):291:296 -> a
+    50:50:void clearReads():309:309 -> a
+    51:67:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):317:333 -> a
+    68:70:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):323:325 -> a
+    71:74:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):324:327 -> a
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$flattenAccessContexts$0(com.android.tools.r8.graph.DexField):57:57 -> b
+    2:2:boolean lambda$forEachIndirectAccess$3(java.util.Set,com.android.tools.r8.graph.DexField):121:121 -> b
+    3:3:void forEachWriteContext(java.util.function.Consumer):171:171 -> b
     4:9:void forEachAccessContext(java.util.Map,java.util.function.Consumer):178:183 -> b
-    4:9:void forEachWriteContext(java.util.function.Consumer):170 -> b
-    10:13:boolean isWrittenOnlyInMethodSatisfying(java.util.function.Predicate):260:263 -> b
-    14:19:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):299:304 -> b
-    20:20:void clearWrites():312:312 -> b
-    21:23:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):334:336 -> b
-    24:27:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,java.util.Set):335:338 -> b
-    1:2:void flattenAccessContexts():48:49 -> c
-    3:3:boolean lambda$forEachIndirectAccessWithContexts$5(com.android.tools.r8.graph.DexField):141:141 -> c
-    1:1:com.android.tools.r8.graph.DexField getField():77:77 -> d
-    2:2:boolean lambda$forEachIndirectAccessWithContexts$6(com.android.tools.r8.graph.DexField):143:143 -> d
-    1:1:int getNumberOfWriteContexts():87:87 -> e
-    2:5:int getNumberOfAccessContexts(java.util.Map):94:97 -> e
-    2:5:int getNumberOfWriteContexts():87 -> e
-    6:6:java.util.Set lambda$recordRead$9(com.android.tools.r8.graph.DexField):294:294 -> e
-    1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():102:105 -> f
-    5:5:java.util.Set lambda$recordWrite$10(com.android.tools.r8.graph.DexField):303:303 -> f
+    4:9:void forEachWriteContext(java.util.function.Consumer):171 -> b
+    10:13:boolean isWrittenOnlyInMethodSatisfying(java.util.function.Predicate):261:264 -> b
+    14:19:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):300:305 -> b
+    20:20:void clearWrites():313:313 -> b
+    21:23:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):335:337 -> b
+    24:27:void lambda$rewrittenWithLens$14(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):336:339 -> b
+    1:2:void flattenAccessContexts():50:51 -> c
+    3:3:boolean lambda$forEachIndirectAccessWithContexts$5(com.android.tools.r8.graph.DexField):142:142 -> c
+    1:1:com.android.tools.r8.graph.DexField getField():79:79 -> d
+    2:2:boolean lambda$forEachIndirectAccessWithContexts$6(com.android.tools.r8.graph.DexField):144:144 -> d
+    1:1:int getNumberOfWriteContexts():89:89 -> e
+    2:5:int getNumberOfAccessContexts(java.util.Map):96:99 -> e
+    2:5:int getNumberOfWriteContexts():89 -> e
+    6:6:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordRead$9(com.android.tools.r8.graph.DexField):295:295 -> e
+    1:4:com.android.tools.r8.graph.ProgramMethod getUniqueReadContext():104:107 -> f
+    5:5:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordWrite$10(com.android.tools.r8.graph.DexField):304:304 -> f
     1:1:boolean hasReflectiveAccess():192:192 -> g
-    2:2:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):324:324 -> g
+    2:2:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):325:325 -> g
     1:1:boolean isRead():202:202 -> h
-    2:2:java.util.Set lambda$rewrittenWithLens$13(com.android.tools.r8.graph.DexField):336:336 -> h
-    1:1:boolean isReadFromMethodHandle():207:207 -> i
-    1:1:boolean isWritten():225:225 -> j
-    1:1:boolean isWrittenFromMethodHandle():230:230 -> k
+    2:2:boolean isReadFromAnnotation():207:207 -> h
+    2:2:boolean isRead():202 -> h
+    3:3:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewrittenWithLens$13(com.android.tools.r8.graph.DexField):337:337 -> h
+    1:1:boolean isReadFromMethodHandle():216:216 -> i
+    1:1:boolean isWritten():226:226 -> j
+    1:1:boolean isWrittenFromMethodHandle():231:231 -> k
     1:1:void setHasReflectiveAccess():196:196 -> l
-    1:1:void setReadFromMethodHandle():211:211 -> m
-    1:1:void setWrittenFromMethodHandle():234:234 -> n
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.graph.w0:
+    1:1:void setReadFromAnnotation():211:211 -> m
+    1:1:void setReadFromMethodHandle():220:220 -> n
+    1:1:void setWrittenFromMethodHandle():235:235 -> o
+com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.graph.x0:
+    1:1:void <init>():9:9 -> <init>
+    com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult asSuccessfulResolution() -> a
+    com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
+    com.android.tools.r8.graph.DexEncodedField getResolvedField() -> b
+    boolean isFailedOrUnknownResolution() -> c
+    boolean isSuccessfulResolution() -> d
+com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult -> com.android.tools.r8.graph.x0$a:
+    com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult INSTANCE -> a
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:1:void <init>():86:86 -> <init>
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):92:92 -> a
+    boolean isFailedOrUnknownResolution() -> c
+    1:1:com.android.tools.r8.graph.FieldResolutionResult$FailedFieldResolutionResult access$000():86:86 -> e
+com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult -> com.android.tools.r8.graph.x0$b:
+    com.android.tools.r8.graph.DexClass initialResolutionHolder -> a
+    com.android.tools.r8.graph.DexClass resolvedHolder -> b
+    com.android.tools.r8.graph.DexEncodedField resolvedField -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):45:49 -> <init>
+    com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult asSuccessfulResolution() -> a
+    1:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71:71 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField getResolvedField():62:62 -> b
+    boolean isSuccessfulResolution() -> d
+    1:1:com.android.tools.r8.graph.DexClassAndField getResolutionPair():66:66 -> e
+    2:30:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClassAndField.create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):0:28 -> e
+    2:30:com.android.tools.r8.graph.DexClassAndField getResolutionPair():66 -> e
+    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():57:57 -> f
+com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult -> com.android.tools.r8.graph.x0$c:
+    com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult INSTANCE -> a
+    1:1:void <clinit>():107:107 -> <clinit>
+    1:1:void <init>():105:105 -> <init>
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):111:111 -> a
+    boolean isFailedOrUnknownResolution() -> c
+    1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():105:105 -> e
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.graph.y0:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:5:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):20:24 -> a
     boolean isFinal() -> c
-com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.GenericSignature -> com.android.tools.r8.graph.z0:
     java.util.List EMPTY_TYPE_PARAMS -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:java.util.List access$100():96:96 -> a
-com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.x0$a:
-com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.x0$b:
+com.android.tools.r8.graph.GenericSignature$1 -> com.android.tools.r8.graph.z0$a:
+com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature -> com.android.tools.r8.graph.z0$b:
     com.android.tools.r8.graph.GenericSignature$TypeSignature elementSignature -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():376:376 -> <clinit>
@@ -19390,14 +19588,14 @@
     4:4:com.android.tools.r8.graph.GenericSignature$TypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView):412 -> a
     com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature asArrayTypeSignature() -> g
     boolean isArrayTypeSignature() -> l
-com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.x0$c:
+com.android.tools.r8.graph.GenericSignature$BaseTypeSignature -> com.android.tools.r8.graph.z0$c:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():462:462 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType):465:468 -> <init>
     1:2:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView):483:484 -> a
     1:2:com.android.tools.r8.graph.GenericSignature$TypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView):462 -> a
-com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.x0$d:
+com.android.tools.r8.graph.GenericSignature$ClassSignature -> com.android.tools.r8.graph.z0$d:
     java.util.List formalTypeParameters -> a
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature superClassSignature -> b
     java.util.List superInterfaceSignatures -> c
@@ -19407,7 +19605,7 @@
     1:7:void <init>(java.util.List,com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):166:172 -> <init>
     com.android.tools.r8.graph.GenericSignature$ClassSignature asClassSignature() -> c
     boolean isClassSignature() -> d
-com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.x0$e:
+com.android.tools.r8.graph.GenericSignature$ClassTypeSignature -> com.android.tools.r8.graph.z0$e:
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature enclosingTypeSignature -> d
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature innerTypeSignature -> e
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature UNKNOWN_CLASS_TYPE_SIGNATURE -> f
@@ -19426,14 +19624,14 @@
     com.android.tools.r8.graph.GenericSignature$ClassTypeSignature asClassTypeSignature() -> h
     boolean isClassTypeSignature() -> m
     1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView):366:366 -> p
-com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.x0$f:
+com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature -> com.android.tools.r8.graph.z0$f:
     boolean isFieldTypeSignature() -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> b
     com.android.tools.r8.graph.GenericSignature$ClassSignature asClassSignature() -> c
     boolean isClassSignature() -> d
     boolean isMethodTypeSignature() -> e
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature asMethodTypeSignature() -> f
-com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.x0$g:
+com.android.tools.r8.graph.GenericSignature$FieldTypeSignature -> com.android.tools.r8.graph.z0$g:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator wildcardIndicator -> a
     1:1:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator,com.android.tools.r8.graph.GenericSignature$1):227:227 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):232:233 -> <init>
@@ -19449,12 +19647,12 @@
     boolean isClassTypeSignature() -> m
     boolean isStar() -> n
     boolean isTypeVariableSignature() -> o
-com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.x0$h:
+com.android.tools.r8.graph.GenericSignature$FormalTypeParameter -> com.android.tools.r8.graph.z0$h:
     java.util.List interfaceBounds -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature classBound -> b
     1:4:void <init>(java.lang.String,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,java.util.List):133:136 -> <init>
-com.android.tools.r8.graph.GenericSignature$Kind -> com.android.tools.r8.graph.x0$i:
+com.android.tools.r8.graph.GenericSignature$Kind -> com.android.tools.r8.graph.z0$i:
     com.android.tools.r8.graph.GenericSignature$Kind CLASS -> a
     com.android.tools.r8.graph.GenericSignature$Kind FIELD -> b
     com.android.tools.r8.graph.GenericSignature$Kind METHOD -> c
@@ -19465,7 +19663,7 @@
     1:9:java.util.function.Function parserMethod(com.android.tools.r8.graph.GenericSignature$Parser):580:588 -> a
     10:10:java.util.function.Function parserMethod(com.android.tools.r8.graph.GenericSignature$Parser):584:584 -> a
     11:11:java.util.function.Function parserMethod(com.android.tools.r8.graph.GenericSignature$Parser):582:582 -> a
-com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.x0$j:
+com.android.tools.r8.graph.GenericSignature$MethodTypeSignature -> com.android.tools.r8.graph.z0$j:
     java.util.List typeSignatures -> b
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature UNKNOWN_METHOD_TYPE_SIGNATURE -> d
     java.util.List formalTypeParameters -> a
@@ -19477,7 +19675,7 @@
     boolean isMethodTypeSignature() -> e
     com.android.tools.r8.graph.GenericSignature$MethodTypeSignature asMethodTypeSignature() -> f
     1:1:com.android.tools.r8.graph.GenericSignature$ReturnType returnType():540:540 -> g
-com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.x0$k:
+com.android.tools.r8.graph.GenericSignature$Parser -> com.android.tools.r8.graph.z0$k:
     char[] buffer -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
@@ -19494,18 +19692,18 @@
     8:15:com.android.tools.r8.graph.GenericSignature$Kind com.android.tools.r8.graph.GenericSignature$Kind.fromDexDefinition(com.android.tools.r8.graph.DexDefinition):566:573 -> a
     8:15:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toGenericSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView):610 -> a
     16:21:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toGenericSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView):611:616 -> a
-    22:22:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
+    22:22:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
     22:22:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toGenericSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView):617 -> a
     23:23:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toGenericSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView):616:616 -> a
     24:24:com.android.tools.r8.graph.GenericSignature$Kind com.android.tools.r8.graph.GenericSignature$Kind.fromDexDefinition(com.android.tools.r8.graph.DexDefinition):575:575 -> a
     24:24:com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature toGenericSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView):610 -> a
     25:30:com.android.tools.r8.graph.GenericSignature$ClassSignature toClassSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):625:630 -> a
     31:31:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature toFieldTypeSignature(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):635:635 -> a
-    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     32:32:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature toFieldTypeSignature(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):635 -> a
     33:38:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature toFieldTypeSignature(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):637:642 -> a
     39:39:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature toMethodTypeSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):647:647 -> a
-    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     40:40:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature toMethodTypeSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):647 -> a
     41:46:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature toMethodTypeSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):649:654 -> a
     47:55:com.android.tools.r8.graph.GenericSignature$ClassSignature parseClassSignature(java.lang.String):682:690 -> a
@@ -19555,26 +19753,32 @@
     1:13:java.util.List updateOptTypeArguments():916:928 -> f
     1:14:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature updateTypeArgument():933:946 -> g
     1:7:com.android.tools.r8.graph.GenericSignature$TypeVariableSignature updateTypeVariableSignature():952:958 -> h
-com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.x0$l:
+com.android.tools.r8.graph.GenericSignature$Parser$ParserPosition -> com.android.tools.r8.graph.z0$k$a:
+    com.android.tools.r8.graph.GenericSignature$Parser$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> a
+    com.android.tools.r8.graph.GenericSignature$Parser$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> b
+    com.android.tools.r8.graph.GenericSignature$Parser$ParserPosition MEMBER_ANNOTATION -> c
+    1:3:void <clinit>():736:738 -> <clinit>
+    1:1:void <init>(java.lang.String,int):735:735 -> <init>
+com.android.tools.r8.graph.GenericSignature$ReturnType -> com.android.tools.r8.graph.z0$l:
     com.android.tools.r8.graph.GenericSignature$ReturnType VOID -> b
     com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature -> a
     1:1:void <clinit>():489:489 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.GenericSignature$TypeSignature):494:495 -> <init>
     1:1:boolean isVoidDescriptor():499:499 -> a
     1:1:com.android.tools.r8.graph.GenericSignature$TypeSignature typeSignature():503:503 -> b
-com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.x0$m:
+com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature -> com.android.tools.r8.graph.z0$m:
     com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature STAR_FIELD_TYPE_SIGNATURE -> b
     1:1:void <clinit>():291:291 -> <clinit>
     1:1:void <init>():295:295 -> <init>
     1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asArgument(com.android.tools.r8.graph.GenericSignature$WildcardIndicator):300:300 -> a
     boolean isStar() -> n
     1:1:com.android.tools.r8.graph.GenericSignature$StarFieldTypeSignature access$200():289:289 -> p
-com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.x0$n:
+com.android.tools.r8.graph.GenericSignature$TypeSignature -> com.android.tools.r8.graph.z0$n:
     1:1:void <init>():194:194 -> <init>
     boolean isFieldTypeSignature() -> a
     com.android.tools.r8.graph.GenericSignature$TypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.graph.GenericSignature$FieldTypeSignature asFieldTypeSignature() -> b
-com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.x0$o:
+com.android.tools.r8.graph.GenericSignature$TypeVariableSignature -> com.android.tools.r8.graph.z0$o:
     java.lang.String typeVariable -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():421:421 -> <clinit>
@@ -19586,44 +19790,47 @@
     com.android.tools.r8.graph.GenericSignature$TypeVariableSignature asTypeVariableSignature() -> i
     boolean isTypeVariableSignature() -> o
     1:1:com.android.tools.r8.graph.GenericSignature$ArrayTypeSignature toArrayTypeSignature(com.android.tools.r8.graph.AppView):453:453 -> p
-com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.x0$p:
+com.android.tools.r8.graph.GenericSignature$WildcardIndicator -> com.android.tools.r8.graph.z0$p:
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NEGATIVE -> c
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NONE -> b
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator NOT_AN_ARGUMENT -> a
     com.android.tools.r8.graph.GenericSignature$WildcardIndicator POSITIVE -> d
     1:4:void <clinit>():221:224 -> <clinit>
     1:1:void <init>(java.lang.String,int):220:220 -> <init>
-com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.A0:
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():38:38 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():222:222 -> a
-    2:4:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map,java.util.function.Function):324:326 -> a
-    5:5:void lambda$rewriteReferenceKeys$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.function.Function,com.android.tools.r8.graph.DexReference,java.lang.Object):325:325 -> a
-    1:6:boolean assertDefinitionsNotModified(java.lang.Iterable):241:246 -> assertDefinitionsNotModified
-    1:11:boolean assertReferencesNotModified(java.lang.Iterable):252:262 -> assertReferencesNotModified
-    1:1:boolean isIdentityLense():230:230 -> isIdentityLense
-    1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):168:169 -> lookupMethod
-    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):179:181 -> lookupMethodInAllContexts
-    1:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):195:201 -> lookupReference
-    1:12:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):147:158 -> mapDexEncodedMethod
-    13:13:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> mapDexEncodedMethod
-    13:13:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):159 -> mapDexEncodedMethod
-    14:14:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):160:160 -> mapDexEncodedMethod
-    1:12:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsConservatively(java.util.Set):308:319 -> rewriteMethodsConservatively
-    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsWithRenamedSignature(java.util.Set):299:304 -> rewriteMethodsWithRenamedSignature
-    1:10:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteReferencesConservatively(java.util.Set):269:278 -> rewriteReferencesConservatively
-    11:20:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:292 -> rewriteReferencesConservatively
-    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):218:218 -> verifyIsContextFreeForMethod
-    1:22:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):334:355 -> verifyMappingToOriginalProgram
+    1:1:com.android.tools.r8.graph.GraphLense getIdentityLense():237:237 -> a
+    2:4:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map,java.util.function.Function):339:341 -> a
+    5:5:void lambda$rewriteReferenceKeys$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.function.Function,com.android.tools.r8.graph.DexReference,java.lang.Object):340:340 -> a
+    1:6:boolean assertDefinitionsNotModified(java.lang.Iterable):256:261 -> assertDefinitionsNotModified
+    1:11:boolean assertReferencesNotModified(java.lang.Iterable):267:277 -> assertReferencesNotModified
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):144:144 -> getRenamedMethodSignature
+    1:1:boolean isIdentityLense():245:245 -> isIdentityLense
+    1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):183:184 -> lookupMethod
+    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):194:196 -> lookupMethodInAllContexts
+    1:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):210:216 -> lookupReference
+    1:1:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):151:151 -> mapDexEncodedMethod
+    2:10:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):158:166 -> mapDexEncodedMethod
+    11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> mapDexEncodedMethod
+    11:11:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):167 -> mapDexEncodedMethod
+    12:12:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLense):168:168 -> mapDexEncodedMethod
+    1:3:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):174:176 -> mapProgramMethod
+    1:12:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsConservatively(java.util.Set):323:334 -> rewriteMethodsConservatively
+    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsWithRenamedSignature(java.util.Set):314:319 -> rewriteMethodsWithRenamedSignature
+    1:10:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteReferencesConservatively(java.util.Set):284:293 -> rewriteReferencesConservatively
+    11:20:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap rewriteReferencesConservatively(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):298:307 -> rewriteReferencesConservatively
+    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):233:233 -> verifyIsContextFreeForMethod
+    1:22:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):349:370 -> verifyMappingToOriginalProgram
     23:125:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):0:102 -> verifyMappingToOriginalProgram
-    23:125:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):355 -> verifyMappingToOriginalProgram
-    126:136:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):358:368 -> verifyMappingToOriginalProgram
-    137:157:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):387:407 -> verifyMappingToOriginalProgram
-    137:157:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):369 -> verifyMappingToOriginalProgram
-    158:162:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):368:372 -> verifyMappingToOriginalProgram
-    1:2:com.android.tools.r8.graph.GraphLense withCodeRewritingsApplied():234:235 -> withCodeRewritingsApplied
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.y0$a:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.y0$b:
+    23:125:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):370 -> verifyMappingToOriginalProgram
+    126:136:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):373:383 -> verifyMappingToOriginalProgram
+    137:157:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):402:422 -> verifyMappingToOriginalProgram
+    137:157:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):384 -> verifyMappingToOriginalProgram
+    158:162:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):383:387 -> verifyMappingToOriginalProgram
+    1:2:com.android.tools.r8.graph.GraphLense withCodeRewritingsApplied():249:250 -> withCodeRewritingsApplied
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.A0$a:
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.A0$b:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -19636,76 +19843,76 @@
     1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):86:86 -> b
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):100 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):101:101 -> b
-com.android.tools.r8.graph.GraphLense$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.y0$c:
+com.android.tools.r8.graph.GraphLense$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.A0$c:
     com.android.tools.r8.graph.GraphLense previous -> b
-    1:2:void <init>(com.android.tools.r8.graph.GraphLense):485:486 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):496:496 -> getOriginalFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):501:501 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):491:491 -> getOriginalType
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):506:506 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):511:511 -> getRenamedMethodSignature
-    1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult com.android.tools.r8.graph.GraphLense$IdentityGraphLense.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):455:455 -> lookupMethod
-    1:1: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):481 -> lookupMethod
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLense$IdentityGraphLense.lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):460:460 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):481 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):516:516 -> lookupType
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.y0$d:
+    1:2:void <init>(com.android.tools.r8.graph.GraphLense):500:501 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):511:511 -> getOriginalFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):516:516 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):506:506 -> getOriginalType
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):521:521 -> getRenamedFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense):527:527 -> getRenamedMethodSignature
+    1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult com.android.tools.r8.graph.GraphLense$IdentityGraphLense.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):470:470 -> lookupMethod
+    1:1: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):496 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLense$IdentityGraphLense.lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):475:475 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):496 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):533:533 -> lookupType
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.A0$d:
     com.android.tools.r8.ir.code.Invoke$Type type -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):50:52 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():56:56 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.y0$e:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.A0$e:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> a
-    1:1:void <clinit>():415:415 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GraphLense$1):413:413 -> <init>
-    2:2:void <init>():417:417 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$000():413:413 -> b
-    1:1: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):455:455 -> lookupMethod
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):460:460 -> lookupPrototypeChanges
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.y0$f:
-    1:1:void <clinit>():530:530 -> <clinit>
-    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):558:558 -> <init>
-    2:26: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):536:560 -> <init>
-    27:35: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):559:567 -> <init>
-    1:4:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):586:589 -> getOriginalFieldSignature
-    1:4:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):595:598 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):580:580 -> getOriginalType
-    1:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):603:605 -> getRenamedFieldSignature
-    1:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):611:613 -> getRenamedMethodSignature
-    1:1:boolean isContextFreeForMethods():727:727 -> isContextFreeForMethods
-    1:2:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):721:722 -> lookupField
-    1:1:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):664:664 -> lookupGetFieldForMethod
-    1:12: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):643:654 -> lookupMethod
-    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):712:714 -> lookupMethodInAllContexts
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):659:659 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):669:669 -> lookupPutFieldForMethod
-    1:19:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):619:637 -> lookupType
-    1:14: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):692:705 -> mapVirtualInterfaceInvocationTypes
-    1:17:java.lang.String toString():738:754 -> toString
-    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):732:732 -> verifyIsContextFreeForMethod
-    1:4:java.lang.Object withAlternativeParentLens(com.android.tools.r8.graph.GraphLense,java.util.function.Supplier):571:574 -> withAlternativeParentLens
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.z0:
+    1:1:void <clinit>():430:430 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GraphLense$1):428:428 -> <init>
+    2:2:void <init>():432:432 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$000():428:428 -> b
+    1:1: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):470:470 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):475:475 -> lookupPrototypeChanges
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.A0$f:
+    1:1:void <clinit>():547:547 -> <clinit>
+    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):575:575 -> <init>
+    2:26: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):553:577 -> <init>
+    27:35: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):576:584 -> <init>
+    1:4:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):603:606 -> getOriginalFieldSignature
+    1:4:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):612:615 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):597:597 -> getOriginalType
+    1:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):620:622 -> getRenamedFieldSignature
+    1:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense):631:633 -> getRenamedMethodSignature
+    1:1:boolean isContextFreeForMethods():747:747 -> isContextFreeForMethods
+    1:2:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):741:742 -> lookupField
+    1:1:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):684:684 -> lookupGetFieldForMethod
+    1:12: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):663:674 -> lookupMethod
+    1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):732:734 -> lookupMethodInAllContexts
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):679:679 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):689:689 -> lookupPutFieldForMethod
+    1:19:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):639:657 -> lookupType
+    1:14: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):712:725 -> mapVirtualInterfaceInvocationTypes
+    1:17:java.lang.String toString():758:774 -> toString
+    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):752:752 -> verifyIsContextFreeForMethod
+    1:4:java.lang.Object withAlternativeParentLens(com.android.tools.r8.graph.GraphLense,java.util.function.Supplier):588:591 -> withAlternativeParentLens
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.B0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):19:19 -> collectMixedSectionItems
     1:1:void flushCachedValues():28:28 -> flushCachedValues
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.graph.C0:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getDefault():17:17 -> b
     boolean isFinal() -> c
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.graph.A0$a:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.graph.C0$a:
     java.util.Map mapping -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():26:26 -> <clinit>
     1:3:void <init>():26:28 -> <init>
     1:2:void map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):31:32 -> a
     3:3:com.android.tools.r8.graph.FinalInitClassLens build():36:36 -> a
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.D0:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -19729,8 +19936,8 @@
     1:1:boolean isAnonymous():46:46 -> e
     1:1:boolean isNamed():42:42 -> f
     1:4:java.lang.String toString():108:111 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.graph.C0:
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.D0:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.F0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -19764,78 +19971,92 @@
     3:4:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):52:53 -> g
     5:5:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.org.objectweb.asm.Type):48:48 -> g
     5:5:com.android.tools.r8.graph.DexType getTypeFromName(java.lang.String):53 -> g
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.G0:
     java.util.function.Consumer classConsumer -> b
     com.android.tools.r8.graph.JarApplicationReader application -> a
     byte[] CLASSFILE_HEADER -> c
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():70:72 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):81:83 -> <init>
-    1:1:int access$000(int):70:70 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):70:70 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):70:70 -> a
-    4:13:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):87:96 -> a
-    14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    14:14:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):96 -> a
-    15:37:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):96:118 -> a
-    38:38:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    38:38:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):118 -> a
-    39:45:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):123:129 -> a
-    46:50:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):127:131 -> a
-    51:51:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    51:51:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):131 -> a
-    52:52:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):131:131 -> a
-    53:53:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):101:101 -> a
-    54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    54:54:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):101 -> a
-    55:55:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,java.io.InputStream):101:101 -> a
-    56:58:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):150:152 -> a
-    59:62:void lambda$createAnnotationVisitor$0(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):164:164 -> a
-    63:70:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):533:540 -> a
-    63:70:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):70 -> a
-    71:71:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    71:71:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):540 -> a
-    71:71:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):70 -> a
-    72:75:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):540:543 -> a
-    72:75:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):70 -> a
-    76:76:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):534:534 -> a
-    76:76:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):70 -> a
+    1:3:void <clinit>():69:71 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):80:82 -> <init>
+    1:1:int access$000(int):69:69 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor access$100(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):69:69 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedAnnotation access$1700(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):69:69 -> a
+    4:9:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):95:100 -> a
+    4:9:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    10:10:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    10:10:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):100 -> a
+    10:10:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    11:28:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):100:117 -> a
+    11:28:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    29:29:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    29:29:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):117 -> a
+    29:29:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    30:36:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):122:128 -> a
+    30:36:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    37:41:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):126:130 -> a
+    37:41:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    42:42:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    42:42:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):130 -> a
+    42:42:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    43:43:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):130:130 -> a
+    43:43:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    44:44:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):96:96 -> a
+    44:44:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    45:45:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    45:45:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):96 -> a
+    45:45:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    46:46:void internalRead(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):96:96 -> a
+    46:46:void lambda$read$0(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):91 -> a
+    47:49:com.android.tools.r8.graph.MethodAccessFlags createMethodAccessFlags(java.lang.String,int):149:151 -> a
+    50:53:void lambda$createAnnotationVisitor$1(java.util.List,int,java.lang.String,com.android.tools.r8.graph.JarApplicationReader,java.util.List,java.util.List):163:163 -> a
+    54:61:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):532:539 -> a
+    54:61:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):69 -> a
+    62:62:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    62:62:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):539 -> a
+    62:62:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):69 -> a
+    63:66:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):539:542 -> a
+    63:66:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):69 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet createAnnotationSet(java.util.List,com.android.tools.r8.utils.InternalOptions):533:533 -> a
+    67:67:com.android.tools.r8.graph.DexAnnotationSet access$200(java.util.List,com.android.tools.r8.utils.InternalOptions):69 -> a
     int cleanAccessFlags(int) -> b
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):158:158 -> b
-    2:4:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):173:175 -> b
-    2:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):159 -> b
-    5:5:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):174:174 -> b
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):159 -> b
-    6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):161:161 -> b
-    7:9:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):180:180 -> b
-    11:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):182:186 -> b
-    1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):145:145 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.E0$a:
+    1:1:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):90:90 -> b
+    2:2:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):199:199 -> b
+    2:2:void read(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[]):90 -> b
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):157:157 -> b
+    4:6:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):172:174 -> b
+    4:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):158 -> b
+    7:7:boolean retainCompileTimeAnnotation(java.lang.String,com.android.tools.r8.graph.JarApplicationReader):173:173 -> b
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):158 -> b
+    8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor createAnnotationVisitor(java.lang.String,boolean,java.util.List,com.android.tools.r8.graph.JarApplicationReader):160:160 -> b
+    9:11:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):179:179 -> b
+    13:17:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):181:185 -> b
+    1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):144:144 -> c
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.G0$a:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.JarApplicationReader application -> a
     java.util.function.BiConsumer onVisitEnd -> b
-    1:1:void <clinit>():861:861 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):870:870 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):865:872 -> <init>
-    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):882:883 -> a
-    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):888:888 -> a
-    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):889:889 -> a
-    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):895:895 -> a
-    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):896:897 -> a
-    10:10:void visitEnd():903:903 -> a
-    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):908:913 -> a
-    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):979:1000 -> a
-    17:38:void visit(java.lang.String,java.lang.Object):877 -> a
-    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):917:972 -> a
-    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1002 -> a
-    39:94:void visit(java.lang.String,java.lang.Object):877 -> a
-    95:95:void visit(java.lang.String,java.lang.Object):877:877 -> a
-    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):974:974 -> a
-    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1002 -> a
-    96:96:void visit(java.lang.String,java.lang.Object):877 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.E0$b:
+    1:1:void <clinit>():860:860 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):869:869 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):864:871 -> <init>
+    1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):881:882 -> a
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):887:887 -> a
+    4:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):888:888 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):894:894 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):895:896 -> a
+    10:10:void visitEnd():902:902 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):907:912 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):978:999 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):876 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):916:971 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1001 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):876 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):876:876 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):973:973 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1001 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):876 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.G0$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -19861,135 +20082,135 @@
     com.android.tools.r8.graph.NestHostClassAttribute nestHost -> n
     com.android.tools.r8.graph.DexTypeList interfaces -> l
     com.android.tools.r8.graph.DexString sourceFile -> m
-    1:1:void <clinit>():189:189 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):224:224 -> <init>
-    2:36:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):195:229 -> <init>
+    1:1:void <clinit>():188:188 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):223:223 -> <init>
+    2:36:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):194:228 -> <init>
     long lambda$getChecksumSupplier$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> a
-    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):189:189 -> a
-    3:7:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):235:239 -> a
-    8:22:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):237:251 -> a
-    23:23:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):246:246 -> a
-    24:29:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):257:262 -> a
-    30:32:void visitNestHost(java.lang.String):267:269 -> a
-    33:33:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):292:292 -> a
-    34:35:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):280:281 -> a
-    34:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):292 -> a
-    36:36:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):292:292 -> a
-    37:37:java.lang.String illegalClassFilePostfix(int):287:287 -> a
-    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):294 -> a
-    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):294:294 -> a
-    39:54:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):300:315 -> a
-    55:55:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> a
+    2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):188:188 -> a
+    3:7:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):234:238 -> a
+    8:22:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):236:250 -> a
+    23:23:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):245:245 -> a
+    24:29:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):256:261 -> a
+    30:32:void visitNestHost(java.lang.String):266:268 -> a
+    33:33:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):291:291 -> a
+    34:35:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):279:280 -> a
+    34: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 illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):291:291 -> a
+    37:37:java.lang.String illegalClassFilePostfix(int):286:286 -> a
+    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):293 -> a
+    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):293:293 -> a
+    39:54:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):299:314 -> a
+    55:55:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     55:55:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    55:55:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):315 -> a
-    56:63:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):315:322 -> a
-    64:64:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):321:321 -> 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
+    55:55:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):314 -> a
+    56:63:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):314:321 -> a
+    64:64:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):320:320 -> a
+    65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     65:65:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    65:65:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):321 -> a
-    66:73:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):321:328 -> a
+    65:65:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):320 -> a
+    66:73:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):320:327 -> a
     74:143:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):0:69 -> a
-    74:143:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328 -> a
-    144:146:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:330 -> a
+    74:143:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):327 -> a
+    144:146:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):327:329 -> a
     147:147:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    147:147:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):330 -> a
-    148:148:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):330:330 -> a
-    149:149:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):508:508 -> a
-    149:149:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):330 -> a
-    150:152:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:311 -> a
-    153:153:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310:310 -> a
-    154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    147:147:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):329 -> a
+    148:148:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):329:329 -> a
+    149:149:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):507:507 -> a
+    149:149:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):329 -> a
+    150:152:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):308:310 -> a
+    153:153:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
+    154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    154:154:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310 -> a
-    155:155:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):310:310 -> a
-    156:156:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):302:302 -> a
-    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    154:154:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309 -> a
+    155:155:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
+    156:156:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):301:301 -> a
+    157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     157:157:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    157:157:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):302 -> a
-    158:158:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):302:302 -> a
-    159:164:void visitSource(java.lang.String,java.lang.String):337:342 -> a
+    157:157:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):301 -> a
+    158:158:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):301:301 -> a
+    159:164:void visitSource(java.lang.String,java.lang.String):336:341 -> a
     165:165:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    165:165:void visitSource(java.lang.String,java.lang.String):342 -> a
+    165:165:void visitSource(java.lang.String,java.lang.String):341 -> a
     166:169:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createSourceDebugExtensionAnnotation(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexItemFactory):202:205 -> a
-    166:169:void visitSource(java.lang.String,java.lang.String):341 -> a
-    170:170:void visitSource(java.lang.String,java.lang.String):340:340 -> a
-    171:179:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):349:357 -> a
-    180:182:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):363:365 -> a
+    166:169:void visitSource(java.lang.String,java.lang.String):340 -> a
+    170:170:void visitSource(java.lang.String,java.lang.String):339:339 -> a
+    171:179: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
+    180:182: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
     183:183:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> a
-    183:183:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):365 -> a
-    184:189:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):365:370 -> a
-    190:190:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):375:375 -> a
-    191:192:void visitEnd():392:393 -> a
+    183:183:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):364 -> a
+    184:189: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
+    190:190:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):374:374 -> a
+    191:192:void visitEnd():391:392 -> a
     193:193:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    193:193:void visitEnd():394 -> a
-    194:194:void visitEnd():393:393 -> a
-    195:195:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):508:508 -> a
-    195:195:void visitEnd():393 -> a
-    196:196:void checkReachabilitySensitivity():478:478 -> a
-    196:196:void visitEnd():396 -> a
-    197:197:boolean hasReachabilitySensitiveField():489:489 -> a
-    197:197:void checkReachabilitySensitivity():478 -> a
-    197:197:void visitEnd():396 -> a
+    193:193:void visitEnd():393 -> a
+    194:194:void visitEnd():392:392 -> a
+    195:195:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):507:507 -> a
+    195:195:void visitEnd():392 -> a
+    196:196:void checkReachabilitySensitivity():477:477 -> a
+    196:196:void visitEnd():395 -> a
+    197:197:boolean hasReachabilitySensitiveField():488:488 -> a
+    197:197:void checkReachabilitySensitivity():477 -> a
+    197:197:void visitEnd():395 -> a
     198:198:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    198:198:boolean hasReachabilitySensitiveField():489 -> a
-    198:198:void checkReachabilitySensitivity():478 -> a
-    198:198:void visitEnd():396 -> a
-    199:200:boolean hasReachabilitySensitiveField():489:490 -> a
-    199:200:void checkReachabilitySensitivity():478 -> a
-    199:200:void visitEnd():396 -> a
+    198:198:boolean hasReachabilitySensitiveField():488 -> a
+    198:198:void checkReachabilitySensitivity():477 -> a
+    198:198:void visitEnd():395 -> a
+    199:200:boolean hasReachabilitySensitiveField():488:489 -> a
+    199:200:void checkReachabilitySensitivity():477 -> a
+    199:200:void visitEnd():395 -> a
     201:201:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    201:201:boolean hasReachabilitySensitiveField():490 -> a
-    201:201:void checkReachabilitySensitivity():478 -> a
-    201:201:void visitEnd():396 -> a
-    202:204:boolean hasReachabilitySensitiveField():490:492 -> a
-    202:204:void checkReachabilitySensitivity():478 -> a
-    202:204:void visitEnd():396 -> a
-    205:205:void checkReachabilitySensitivity():479:479 -> a
-    205:205:void visitEnd():396 -> a
+    201:201:boolean hasReachabilitySensitiveField():489 -> a
+    201:201:void checkReachabilitySensitivity():477 -> a
+    201:201:void visitEnd():395 -> a
+    202:204:boolean hasReachabilitySensitiveField():489:491 -> a
+    202:204:void checkReachabilitySensitivity():477 -> a
+    202:204:void visitEnd():395 -> a
+    205:205:void checkReachabilitySensitivity():478:478 -> a
+    205:205:void visitEnd():395 -> a
     206:206:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    206:206:void checkReachabilitySensitivity():479 -> a
-    206:206:void visitEnd():396 -> a
-    207:210:void checkReachabilitySensitivity():479:482 -> a
-    207:210:void visitEnd():396 -> a
-    211:228:void visitEnd():397:414 -> a
+    206:206:void checkReachabilitySensitivity():478 -> a
+    206:206:void visitEnd():395 -> a
+    207:210:void checkReachabilitySensitivity():478:481 -> a
+    207:210:void visitEnd():395 -> a
+    211:228:void visitEnd():396:413 -> a
     229:229:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    229:229:void visitEnd():415 -> a
-    230:231:void visitEnd():415:416 -> a
-    232:271:void visitEnd():398:437 -> a
-    272:272:void visitEnd():433:433 -> a
-    273:273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    229:229:void visitEnd():414 -> a
+    230:231:void visitEnd():414:415 -> a
+    232:271:void visitEnd():397:436 -> a
+    272:272:void visitEnd():432:432 -> a
+    273:273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     273:273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    273:273:void visitEnd():433 -> a
-    274:294:void visitEnd():433:453 -> a
-    295:301:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):457:463 -> a
-    302:305:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):501:504 -> a
-    302:305:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):189 -> a
-    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> b
-    2:4:void visitNestMember(java.lang.String):274:276 -> b
-    5:8:java.util.List getAnnotations():512:515 -> b
-    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> c
-    2:2:void checkName(java.lang.String):467:467 -> c
+    273:273:void visitEnd():432 -> a
+    274:294:void visitEnd():432:452 -> a
+    295:301:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):456:462 -> a
+    302:305:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):500:503 -> a
+    302:305:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):188 -> a
+    1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> b
+    2:4:void visitNestMember(java.lang.String):273:275 -> b
+    5:8:java.util.List getAnnotations():511:514 -> b
+    1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> c
+    2:2:void checkName(java.lang.String):466:466 -> c
     3:3:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
-    3:3:void checkName(java.lang.String):467 -> c
-    4:6:void checkName(java.lang.String):467:469 -> c
+    3:3:void checkName(java.lang.String):466 -> c
+    4:6:void checkName(java.lang.String):466:468 -> c
     7:7:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    7:7:void checkName(java.lang.String):469 -> c
-    8:8:void checkName(java.lang.String):469:469 -> c
-    9:9:int getMajorVersion():519:519 -> c
-    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> d
-    2:2:boolean isInANest():527:527 -> d
-    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> e
-    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> f
-    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> g
-    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> h
-    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> i
-    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> j
-    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> k
-    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):189:189 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.E0$c:
+    7:7:void checkName(java.lang.String):468 -> c
+    8:8:void checkName(java.lang.String):468:468 -> c
+    9:9:int getMajorVersion():518:518 -> c
+    1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> d
+    2:2:boolean isInANest():526:526 -> d
+    1:1:java.util.List access$1500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> e
+    1:1:com.android.tools.r8.graph.JarApplicationReader access$300(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> f
+    1:1:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> g
+    1:1:java.util.Set access$500(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> h
+    1:1:java.util.List access$600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> i
+    1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> j
+    1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> k
+    1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):188:188 -> l
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.G0$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -19997,28 +20218,28 @@
     int access -> c
     java.lang.String desc -> e
     java.lang.String name -> d
-    1:1:void <clinit>():546:546 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):557:557 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):553:565 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):564:564 -> <init>
+    1:1:void <clinit>():545:545 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):556:556 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):552:564 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):563:563 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-    1:7:void visitEnd():583:589 -> a
-    8:8:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):607:607 -> a
-    8:8:void visitEnd():589 -> a
+    1:7:void visitEnd():582:588 -> a
+    8:8:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):606:606 -> a
+    8:8:void visitEnd():588 -> a
     9:9:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    9:9:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):607 -> a
-    9:9:void visitEnd():589 -> a
-    10:39:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):608:637 -> a
-    10:39:void visitEnd():589 -> a
-    40:49:void visitEnd():590:599 -> a
-    50:50:void visitEnd():597:597 -> a
-    51:54:java.util.List getAnnotations():645:648 -> a
-    51:54:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):641 -> a
-    55:55:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):641:641 -> a
-    56:59:java.util.List getAnnotations():645:648 -> a
-    56:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):571 -> a
-    60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):571:571 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.E0$d:
+    9:9:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):606 -> a
+    9:9:void visitEnd():588 -> a
+    10:39:com.android.tools.r8.graph.DexValue getStaticValue(java.lang.Object,com.android.tools.r8.graph.DexType):607:636 -> a
+    10:39:void visitEnd():588 -> a
+    40:49:void visitEnd():589:598 -> a
+    50:50:void visitEnd():596:596 -> a
+    51:54:java.util.List getAnnotations():644:647 -> a
+    51:54:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):640 -> a
+    55:55:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):640:640 -> a
+    56:59:java.util.List getAnnotations():644:647 -> a
+    56:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):570 -> a
+    60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):570:570 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.G0$d:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -20032,70 +20253,70 @@
     com.android.tools.r8.graph.MethodAccessFlags flags -> t
     com.android.tools.r8.graph.DexMethod method -> s
     java.util.List annotations -> m
-    1:1:void <clinit>():652:652 -> <clinit>
-    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):669:669 -> <init>
-    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):657:681 -> <init>
-    27:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):680:685 -> <init>
-    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):684:684 -> <init>
+    1:1:void <clinit>():651:651 -> <clinit>
+    1:1:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):668:668 -> <init>
+    2:26:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):656:680 -> <init>
+    27:32:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):679:684 -> <init>
+    33:33:void <init>(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):683:683 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     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) -> a
-    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):691:691 -> a
-    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():696:696 -> a
-    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):697:698 -> a
-    5:11:void visitAnnotableParameterCount(int,boolean):711:717 -> a
-    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):722:733 -> a
-    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):732:732 -> a
-    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):857:857 -> a
+    1:1:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):690:690 -> a
+    2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotationDefault():695:695 -> a
+    3:4:void lambda$visitAnnotationDefault$0(java.util.List,java.util.List):696:697 -> a
+    5:11:void visitAnnotableParameterCount(int,boolean):710:716 -> a
+    12:23:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):721:732 -> a
+    24:24:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int,java.lang.String,boolean):731:731 -> a
+    25:25:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):856:856 -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> b
-    1:6:void visitParameter(java.lang.String,int):759:764 -> b
+    1:6:void visitParameter(java.lang.String,int):758:763 -> b
     7:7:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> b
-    7:7:void visitParameter(java.lang.String,int):764 -> b
-    8:10:void visitParameter(java.lang.String,int):764:766 -> b
-    11:11:void visitCode():771:771 -> b
+    7:7:void visitParameter(java.lang.String,int):763 -> b
+    8:10:void visitParameter(java.lang.String,int):763:765 -> b
+    11:11:void visitCode():770:770 -> b
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> c
-    1:2:void visitEnd():784:785 -> c
-    3:5:boolean classRequiresCode():775:777 -> c
-    3:5:void visitEnd():785 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1180 -> c
-    6:6:boolean classRequiresCode():777 -> c
-    6:6:void visitEnd():785 -> c
-    7:9:boolean classRequiresCode():777:779 -> c
-    7:9:void visitEnd():785 -> c
-    10:20:void visitEnd():786:796 -> c
+    1:2:void visitEnd():783:784 -> c
+    3:5:boolean classRequiresCode():774:776 -> c
+    3:5:void visitEnd():784 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1214 -> c
+    6:6:boolean classRequiresCode():776 -> c
+    6:6:void visitEnd():784 -> c
+    7:9:boolean classRequiresCode():776:778 -> c
+    7:9:void visitEnd():784 -> c
+    10:20:void visitEnd():785:795 -> c
     21:21:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> c
-    21:21:void visitEnd():796 -> c
-    22:26:void visitEnd():798:802 -> c
-    27:33:void visitEnd():801:807 -> c
+    21:21:void visitEnd():795 -> c
+    22:26:void visitEnd():797:801 -> c
+    27:33:void visitEnd():800:806 -> c
     34:34:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
-    34:34:void visitEnd():807 -> c
+    34:34:void visitEnd():806 -> c
     35:43:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createMethodParametersAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):211:219 -> c
-    35:43:void visitEnd():804 -> c
-    44:56:void visitEnd():804:816 -> c
-    57:57:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):224:224 -> c
-    57:57:void visitEnd():816 -> c
-    58:60:void visitEnd():817:819 -> c
-    61:61:boolean isReachabilitySensitive():840:840 -> c
-    61:61:void visitEnd():819 -> c
+    35:43:void visitEnd():803 -> c
+    44:56:void visitEnd():803:815 -> c
+    57:57:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,int):221:221 -> c
+    57:57:void visitEnd():815 -> c
+    58:60:void visitEnd():816:818 -> c
+    61:61:boolean isReachabilitySensitive():839:839 -> c
+    61:61:void visitEnd():818 -> c
     62:62:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> c
-    62:62:boolean isReachabilitySensitive():840 -> c
-    62:62:void visitEnd():819 -> c
-    63:65:boolean isReachabilitySensitive():840:842 -> c
-    63:65:void visitEnd():819 -> c
-    66:67:void visitEnd():819:820 -> c
+    62:62:boolean isReachabilitySensitive():839 -> c
+    62:62:void visitEnd():818 -> c
+    63:65:boolean isReachabilitySensitive():839:841 -> c
+    63:65:void visitEnd():818 -> c
+    66:67:void visitEnd():818:819 -> c
     68:68:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> c
-    68:68:void visitEnd():820 -> c
-    69:72:void visitEnd():820:823 -> c
-    73:83:void visitEnd():821:831 -> c
-    84:84:void visitEnd():828:828 -> c
-    85:93:void visitEnd():826:834 -> c
-    1:4:java.util.List getAnnotations():850:853 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.E0$e:
+    68:68:void visitEnd():819 -> c
+    69:72:void visitEnd():819:822 -> c
+    73:83:void visitEnd():820:830 -> c
+    84:84:void visitEnd():827:827 -> c
+    85:93:void visitEnd():825:833 -> c
+    1:4:java.util.List getAnnotations():849:852 -> d
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.G0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
-    1:8:void <init>():1006:1013 -> <init>
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.L0:
+    1:8:void <init>():1005:1012 -> <init>
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.N0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> d
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.graph.CfCode code -> c
@@ -20107,23 +20328,23 @@
     13:16:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):97:100 -> <init>
     1:2:void markReachabilitySensitive():110:111 -> a
     3:3:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):165:165 -> a
-    4:26:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):991:1013 -> a
-    4:26:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):165 -> a
-    27:27:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):167:167 -> a
-    28:28:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):262:262 -> a
-    28:28:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):170 -> a
-    29:34:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):170:175 -> a
-    35:35:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    35:35:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):175 -> a
-    36:40:void setCode(com.android.tools.r8.graph.CfCode):179:183 -> a
-    36:40:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):87 -> a
+    4:27:com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions getParsingOptions(com.android.tools.r8.graph.JarApplicationReader,boolean):993:1016 -> a
+    4:27:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):165 -> a
+    28:28:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):167:167 -> a
+    29:29:java.util.function.BiFunction createCodeLocator(com.android.tools.r8.graph.JarClassFileReader$ReparseContext):262:262 -> a
+    29:29:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):170 -> a
+    30:35:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):170:175 -> a
+    36:36:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    36:36:void parseCode(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,boolean):175 -> a
+    37:41:void setCode(com.android.tools.r8.graph.CfCode):179:183 -> a
+    37:41:void access$100(com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.graph.CfCode):87 -> a
     1:21:com.android.tools.r8.graph.CfCode asCfCode():126:146 -> asCfCode
-    22:28:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1023:1029 -> asCfCode
+    22:28:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1026:1032 -> asCfCode
     22:28:com.android.tools.r8.graph.CfCode asCfCode():146 -> asCfCode
     29:35:com.android.tools.r8.graph.CfCode asCfCode():143:149 -> asCfCode
     1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):213:213 -> buildIR
     1:2:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):225:226 -> buildInliningIR
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1037:1037 -> collectParameterInfo
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):1040:1040 -> collectParameterInfo
     1:1:boolean computeEquals(java.lang.Object):193:193 -> computeEquals
     1:1:int computeHashCode():188:188 -> computeHashCode
     1:1:int estimatedSizeForInlining():203:203 -> estimatedSizeForInlining
@@ -20134,9 +20355,9 @@
     1:1:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):243:243 -> registerCodeReferencesForDesugaring
     1:1:java.lang.String toString():253:253 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):258:258 -> toString
-    1:1:boolean verifyNoInputReaders():1018:1018 -> verifyNoInputReaders
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.F0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.G0:
+    1:1:boolean verifyNoInputReaders():1021:1021 -> verifyNoInputReaders
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.I0:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions debugParsingOptions -> h
@@ -20145,12 +20366,12 @@
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):297:303 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:319 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.graph.J0:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
     1:4:void <init>(boolean,boolean,int):157:160 -> <init>
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.K0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     int methodIndex -> b
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):265:265 -> <init>
@@ -20159,9 +20380,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):265:265 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):277:277 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):265 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.L0:
     1:1:void <init>(java.lang.String):91:91 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.K0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.M0:
     int maxLocals -> n
     java.util.List localVariables -> q
     java.util.Map canonicalDebugLocalInfo -> r
@@ -20180,280 +20401,280 @@
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):347:347 -> <init>
     2:21:void <init>(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.LazyCfCode,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):335:354 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo lambda$canonicalize$1(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):386:386 -> a
-    2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap parseLocals(int,java.lang.Object[]):393:399 -> a
-    2:8:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):387 -> a
-    9:11:java.util.List parseStack(int,java.lang.Object[]):407:409 -> a
-    9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):388 -> a
-    12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):389:389 -> a
-    13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):450:451 -> a
-    15:15:void visitInsn(int):617:617 -> a
-    16:16:void visitInsn(int):602:602 -> a
-    17:17:void visitInsn(int):599:599 -> a
-    18:18:void visitInsn(int):596:596 -> a
-    19:19:void visitInsn(int):593:593 -> a
-    20:20:void visitInsn(int):590:590 -> a
-    21:21:void visitInsn(int):587:587 -> a
-    22:22:void visitInsn(int):584:584 -> a
+    1:1:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):388:388 -> a
+    2:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap parseLocals(int,java.lang.Object[]):395:401 -> a
+    2:8:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):389 -> a
+    9:11:java.util.List parseStack(int,java.lang.Object[]):409:411 -> a
+    9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):390 -> a
+    12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):391:391 -> a
+    13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):452:453 -> a
+    15:15:void visitInsn(int):619:619 -> a
+    16:16:void visitInsn(int):604:604 -> a
+    17:17:void visitInsn(int):601:601 -> a
+    18:18:void visitInsn(int):598:598 -> a
+    19:19:void visitInsn(int):595:595 -> a
+    20:20:void visitInsn(int):592:592 -> a
+    21:21:void visitInsn(int):589:589 -> a
+    22:22:void visitInsn(int):586:586 -> a
     23:82:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):0:59 -> a
-    23:82:void visitInsn(int):584 -> a
+    23:82:void visitInsn(int):586 -> a
     83:83:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):57:57 -> a
-    83:83:void visitInsn(int):584 -> a
+    83:83:void visitInsn(int):586 -> a
     84:84:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):55:55 -> a
-    84:84:void visitInsn(int):584 -> a
+    84:84:void visitInsn(int):586 -> a
     85:85:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):53:53 -> a
-    85:85:void visitInsn(int):584 -> a
+    85:85:void visitInsn(int):586 -> a
     86:86:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):51:51 -> a
-    86:86:void visitInsn(int):584 -> a
+    86:86:void visitInsn(int):586 -> a
     87:87:com.android.tools.r8.cf.code.CfCmp com.android.tools.r8.cf.code.CfCmp.fromAsm(int):49:49 -> a
-    87:87:void visitInsn(int):584 -> a
-    88:88:void visitInsn(int):584:584 -> a
-    89:89:void visitInsn(int):577:577 -> a
+    87:87:void visitInsn(int):586 -> a
+    88:88:void visitInsn(int):586:586 -> a
+    89:89:void visitInsn(int):579:579 -> a
     90:233:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):0:143 -> a
-    90:233:void visitInsn(int):577 -> a
+    90:233:void visitInsn(int):579 -> a
     234:234:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):141:141 -> a
-    234:234:void visitInsn(int):577 -> a
+    234:234:void visitInsn(int):579 -> a
     235:235:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):139:139 -> a
-    235:235:void visitInsn(int):577 -> a
+    235:235:void visitInsn(int):579 -> a
     236:236:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):137:137 -> a
-    236:236:void visitInsn(int):577 -> a
+    236:236:void visitInsn(int):579 -> a
     237:237:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):135:135 -> a
-    237:237:void visitInsn(int):577 -> a
+    237:237:void visitInsn(int):579 -> a
     238:238:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):133:133 -> a
-    238:238:void visitInsn(int):577 -> a
+    238:238:void visitInsn(int):579 -> a
     239:239:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):131:131 -> a
-    239:239:void visitInsn(int):577 -> a
+    239:239:void visitInsn(int):579 -> a
     240:240:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):129:129 -> a
-    240:240:void visitInsn(int):577 -> a
+    240:240:void visitInsn(int):579 -> a
     241:241:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):127:127 -> a
-    241:241:void visitInsn(int):577 -> a
+    241:241:void visitInsn(int):579 -> a
     242:242:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):125:125 -> a
-    242:242:void visitInsn(int):577 -> a
+    242:242:void visitInsn(int):579 -> a
     243:243:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):123:123 -> a
-    243:243:void visitInsn(int):577 -> a
+    243:243:void visitInsn(int):579 -> a
     244:244:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):121:121 -> a
-    244:244:void visitInsn(int):577 -> a
+    244:244:void visitInsn(int):579 -> a
     245:245:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):119:119 -> a
-    245:245:void visitInsn(int):577 -> a
+    245:245:void visitInsn(int):579 -> a
     246:246:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):117:117 -> a
-    246:246:void visitInsn(int):577 -> a
+    246:246:void visitInsn(int):579 -> a
     247:247:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):115:115 -> a
-    247:247:void visitInsn(int):577 -> a
+    247:247:void visitInsn(int):579 -> a
     248:248:com.android.tools.r8.cf.code.CfNumberConversion com.android.tools.r8.cf.code.CfNumberConversion.fromAsm(int):113:113 -> a
-    248:248:void visitInsn(int):577 -> a
-    249:249:void visitInsn(int):577:577 -> a
-    250:250:void visitInsn(int):560:560 -> a
+    248:248:void visitInsn(int):579 -> a
+    249:249:void visitInsn(int):579:579 -> a
+    250:250:void visitInsn(int):562:562 -> a
     251:329:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):0:78 -> a
-    251:329:void visitInsn(int):560 -> a
+    251:329:void visitInsn(int):562 -> a
     330:330:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):76:76 -> a
-    330:330:void visitInsn(int):560 -> a
+    330:330:void visitInsn(int):562 -> a
     331:331:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):74:74 -> a
-    331:331:void visitInsn(int):560 -> a
+    331:331:void visitInsn(int):562 -> a
     332:332:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):72:72 -> a
-    332:332:void visitInsn(int):560 -> a
+    332:332:void visitInsn(int):562 -> a
     333:333:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):70:70 -> a
-    333:333:void visitInsn(int):560 -> a
+    333:333:void visitInsn(int):562 -> a
     334:334:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):68:68 -> a
-    334:334:void visitInsn(int):560 -> a
+    334:334:void visitInsn(int):562 -> a
     335:335:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):66:66 -> a
-    335:335:void visitInsn(int):560 -> a
+    335:335:void visitInsn(int):562 -> a
     336:336:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):64:64 -> a
-    336:336:void visitInsn(int):560 -> a
+    336:336:void visitInsn(int):562 -> a
     337:337:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):62:62 -> a
-    337:337:void visitInsn(int):560 -> a
+    337:337:void visitInsn(int):562 -> a
     338:338:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):60:60 -> a
-    338:338:void visitInsn(int):560 -> a
+    338:338:void visitInsn(int):562 -> a
     339:339:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):58:58 -> a
-    339:339:void visitInsn(int):560 -> a
+    339:339:void visitInsn(int):562 -> a
     340:340:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):56:56 -> a
-    340:340:void visitInsn(int):560 -> a
+    340:340:void visitInsn(int):562 -> a
     341:341:com.android.tools.r8.cf.code.CfLogicalBinop com.android.tools.r8.cf.code.CfLogicalBinop.fromAsm(int):54:54 -> a
-    341:341:void visitInsn(int):560 -> a
-    342:342:void visitInsn(int):560:560 -> a
-    343:343:void visitInsn(int):546:546 -> a
+    341:341:void visitInsn(int):562 -> a
+    342:342:void visitInsn(int):562:562 -> a
+    343:343:void visitInsn(int):548:548 -> a
     344:344:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):72:72 -> a
-    344:344:void visitInsn(int):546 -> a
+    344:344:void visitInsn(int):548 -> a
     345:345:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):70:70 -> a
-    345:345:void visitInsn(int):546 -> a
+    345:345:void visitInsn(int):548 -> a
     346:346:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):68:68 -> a
-    346:346:void visitInsn(int):546 -> a
+    346:346:void visitInsn(int):548 -> a
     347:347:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):66:66 -> a
-    347:347:void visitInsn(int):546 -> a
+    347:347:void visitInsn(int):548 -> a
     348:348:com.android.tools.r8.cf.code.CfNeg com.android.tools.r8.cf.code.CfNeg.fromAsm(int):64:64 -> a
-    348:348:void visitInsn(int):546 -> a
-    349:349:void visitInsn(int):546:546 -> a
-    350:350:void visitInsn(int):540:540 -> a
+    348:348:void visitInsn(int):548 -> a
+    349:349:void visitInsn(int):548:548 -> a
+    350:350:void visitInsn(int):542:542 -> a
     351:443:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):0:92 -> a
-    351:443:void visitInsn(int):540 -> a
+    351:443:void visitInsn(int):542 -> a
     444:444:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):90:90 -> a
-    444:444:void visitInsn(int):540 -> a
+    444:444:void visitInsn(int):542 -> a
     445:445:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):88:88 -> a
-    445:445:void visitInsn(int):540 -> a
+    445:445:void visitInsn(int):542 -> a
     446:446:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):86:86 -> a
-    446:446:void visitInsn(int):540 -> a
+    446:446:void visitInsn(int):542 -> a
     447:447:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):84:84 -> a
-    447:447:void visitInsn(int):540 -> a
+    447:447:void visitInsn(int):542 -> a
     448:448:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):82:82 -> a
-    448:448:void visitInsn(int):540 -> a
+    448:448:void visitInsn(int):542 -> a
     449:449:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):80:80 -> a
-    449:449:void visitInsn(int):540 -> a
+    449:449:void visitInsn(int):542 -> a
     450:450:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):78:78 -> a
-    450:450:void visitInsn(int):540 -> a
+    450:450:void visitInsn(int):542 -> a
     451:451:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):76:76 -> a
-    451:451:void visitInsn(int):540 -> a
+    451:451:void visitInsn(int):542 -> a
     452:452:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):74:74 -> a
-    452:452:void visitInsn(int):540 -> a
+    452:452:void visitInsn(int):542 -> a
     453:453:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):72:72 -> a
-    453:453:void visitInsn(int):540 -> a
+    453:453:void visitInsn(int):542 -> a
     454:454:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):70:70 -> a
-    454:454:void visitInsn(int):540 -> a
+    454:454:void visitInsn(int):542 -> a
     455:455:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):68:68 -> a
-    455:455:void visitInsn(int):540 -> a
+    455:455:void visitInsn(int):542 -> a
     456:456:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):66:66 -> a
-    456:456:void visitInsn(int):540 -> a
+    456:456:void visitInsn(int):542 -> a
     457:457:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):64:64 -> a
-    457:457:void visitInsn(int):540 -> a
+    457:457:void visitInsn(int):542 -> a
     458:458:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):62:62 -> a
-    458:458:void visitInsn(int):540 -> a
+    458:458:void visitInsn(int):542 -> a
     459:459:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):60:60 -> a
-    459:459:void visitInsn(int):540 -> a
+    459:459:void visitInsn(int):542 -> a
     460:460:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):58:58 -> a
-    460:460:void visitInsn(int):540 -> a
+    460:460:void visitInsn(int):542 -> a
     461:461:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):56:56 -> a
-    461:461:void visitInsn(int):540 -> a
+    461:461:void visitInsn(int):542 -> a
     462:462:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):54:54 -> a
-    462:462:void visitInsn(int):540 -> a
+    462:462:void visitInsn(int):542 -> a
     463:463:com.android.tools.r8.cf.code.CfArithmeticBinop com.android.tools.r8.cf.code.CfArithmeticBinop.fromAsm(int):52:52 -> a
-    463:463:void visitInsn(int):540 -> a
-    464:464:void visitInsn(int):540:540 -> a
-    465:465:void visitInsn(int):518:518 -> a
-    466:466:void visitInsn(int):507:507 -> a
-    467:467:void visitInsn(int):497:497 -> a
-    468:471:void visitInsn(int):485:485 -> a
-    472:475:void visitInsn(int):479:479 -> a
-    476:476:void visitInsn(int):474:474 -> a
-    477:477:void visitInsn(int):470:470 -> a
-    478:478:void visitInsn(int):461:461 -> a
-    479:635:void visitInsn(int):458:614 -> a
-    636:636:void visitInsn(int):611:611 -> a
-    637:637:void visitInsn(int):608:608 -> a
-    638:638:void visitInsn(int):605:605 -> a
-    639:654:void visitTypeInsn(int,java.lang.String):732:747 -> a
-    655:655:void visitTypeInsn(int,java.lang.String):741:741 -> a
-    656:656:void visitTypeInsn(int,java.lang.String):738:738 -> a
-    657:657:void visitTypeInsn(int,java.lang.String):735:735 -> a
-    658:662:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):753:757 -> a
-    663:663:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):762:762 -> a
+    463:463:void visitInsn(int):542 -> a
+    464:464:void visitInsn(int):542:542 -> a
+    465:465:void visitInsn(int):520:520 -> a
+    466:466:void visitInsn(int):509:509 -> a
+    467:467:void visitInsn(int):499:499 -> a
+    468:471:void visitInsn(int):487:487 -> a
+    472:475:void visitInsn(int):481:481 -> a
+    476:476:void visitInsn(int) -> a
+    477:477:void visitInsn(int):472:472 -> a
+    478:478:void visitInsn(int):463:463 -> a
+    479:635:void visitInsn(int):460:616 -> a
+    636:636:void visitInsn(int):613:613 -> a
+    637:637:void visitInsn(int):610:610 -> a
+    638:638:void visitInsn(int):607:607 -> a
+    639:654:void visitTypeInsn(int,java.lang.String):734:749 -> a
+    655:655:void visitTypeInsn(int,java.lang.String):743:743 -> a
+    656:656:void visitTypeInsn(int,java.lang.String):740:740 -> a
+    657:657:void visitTypeInsn(int,java.lang.String):737:737 -> a
+    658:662:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):755:759 -> a
+    663:663:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):764:764 -> a
     664:664:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92:92 -> a
-    664:664:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):762 -> a
-    665:665:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):763:763 -> a
-    666:666:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):768:768 -> a
+    664:664:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):764 -> a
+    665:665:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):765:765 -> a
+    666:666:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):770:770 -> a
     667:739:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:72 -> a
-    667:739:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    667:739:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     740:740:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     740:740:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):72 -> a
-    740:740:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    740:740:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     741:748:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):72:79 -> a
-    741:748:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    741:748:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     749:770:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):274:295 -> a
     749:770:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    749:770:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    749:770:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     771:781:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):289:299 -> a
     771:781:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    771:781:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    771:781:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     782:782:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80:80 -> a
-    782:782:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    782:782:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     783:784:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):301:302 -> a
     783:784:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):80 -> a
-    783:784:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
+    783:784:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
     785:787:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):101:101 -> a
     785:787:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):84 -> a
-    785:787:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):769 -> a
-    788:788:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):770:770 -> a
-    789:819:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):775:805 -> a
-    820:824:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):799:803 -> a
-    825:825:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):795:795 -> a
-    826:826:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):839:839 -> a
-    827:850:void visitLdcInsn(java.lang.Object):844:867 -> a
-    851:855:void visitLdcInsn(java.lang.Object):865:869 -> a
+    785:787:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):771 -> a
+    788:788:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):772:772 -> a
+    789:819:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):777:807 -> a
+    820:824:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):801:805 -> a
+    825:825:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):797:797 -> a
+    826:826:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):841:841 -> a
+    827:850:void visitLdcInsn(java.lang.Object):846:869 -> a
+    851:855:void visitLdcInsn(java.lang.Object):867:871 -> a
     856:856:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    856:856:void visitLdcInsn(java.lang.Object):869 -> a
-    857:859:void visitLdcInsn(java.lang.Object):869:871 -> a
+    856:856:void visitLdcInsn(java.lang.Object):871 -> a
+    857:859:void visitLdcInsn(java.lang.Object):871:873 -> a
     860:860:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    860:860:void visitLdcInsn(java.lang.Object):871 -> a
-    861:861:void visitLdcInsn(java.lang.Object):871:871 -> a
-    862:862:void visitIincInsn(int,int):877:877 -> a
-    863:868:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):882:887 -> a
-    869:873:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):892:896 -> a
-    874:913:void visitMultiANewArrayInsn(java.lang.String,int):901:940 -> a
-    914:914: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):948:948 -> a
-    915:918: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):947:950 -> a
-    919:925: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):956:962 -> a
-    926:932: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):958:964 -> a
+    860:860:void visitLdcInsn(java.lang.Object):873 -> a
+    861:861:void visitLdcInsn(java.lang.Object):873:873 -> a
+    862:862:void visitIincInsn(int,int):879:879 -> a
+    863:868:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):884:889 -> a
+    869:873:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):894:898 -> a
+    874:913:void visitMultiANewArrayInsn(java.lang.String,int):903:942 -> a
+    914:914: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):950:950 -> a
+    915:918: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):949:952 -> a
+    919:925: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):958:964 -> a
+    926:932:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):960:966 -> a
     933:934: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):62:63 -> a
-    933:934: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):964 -> a
-    935:935: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):963:963 -> a
-    936:936:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):969:969 -> a
+    933:934: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):966 -> a
+    935:935:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):965:965 -> a
+    936:936:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):971:971 -> a
     1:6:void visitCode():359:364 -> b
-    7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):415:419 -> b
-    12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):431:443 -> b
-    12:24:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):422 -> b
-    25:25:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):422:422 -> b
-    26:26:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):445:445 -> b
-    26:26:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):422 -> b
-    27:27:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):420:420 -> b
-    28:28:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):427:427 -> b
-    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):648:648 -> b
-    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):646:646 -> b
-    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):643:643 -> b
-    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):640:640 -> b
-    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):637:637 -> b
-    34:34:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):634:634 -> b
-    35:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):628:631 -> b
-    39:39:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):625:625 -> b
-    40:40:void visitIntInsn(int,int):660:660 -> b
-    41:41:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):687:687 -> b
-    41:41:void visitIntInsn(int,int):661 -> b
-    42:42:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):685:685 -> b
-    42:42:void visitIntInsn(int,int):661 -> b
-    43:43:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):683:683 -> b
-    43:43:void visitIntInsn(int,int):661 -> b
-    44:44:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):681:681 -> b
-    44:44:void visitIntInsn(int,int):661 -> b
-    45:45:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):679:679 -> b
-    45:45:void visitIntInsn(int,int):661 -> b
-    46:46:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):677:677 -> b
-    46:46:void visitIntInsn(int,int):661 -> b
-    47:47:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):675:675 -> b
-    47:47:void visitIntInsn(int,int):661 -> b
-    48:48:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):673:673 -> b
-    48:48:void visitIntInsn(int,int):661 -> b
-    49:49:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):671:671 -> b
-    49:49:void visitIntInsn(int,int):661 -> b
-    50:50:void visitIntInsn(int,int):661:661 -> b
-    51:55:void visitIntInsn(int,int):660:664 -> b
-    56:56:void visitIntInsn(int,int):657:657 -> b
-    57:58:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):974:975 -> b
-    1:7:void visitEnd():369:375 -> c
-    8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    8:8:void visitEnd():375 -> c
-    9:12:void visitEnd():375:378 -> c
-    13:13:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):427:427 -> c
-    14:14:com.android.tools.r8.ir.code.If$Type ifType(int):833:833 -> c
-    15:15:com.android.tools.r8.ir.code.If$Type ifType(int):831:831 -> c
-    16:16:com.android.tools.r8.ir.code.If$Type ifType(int):828:828 -> c
-    17:17:com.android.tools.r8.ir.code.If$Type ifType(int):825:825 -> c
-    18:18:com.android.tools.r8.ir.code.If$Type ifType(int):822:822 -> c
-    19:19:com.android.tools.r8.ir.code.If$Type ifType(int):819:819 -> c
-    20:20:com.android.tools.r8.ir.code.If$Type ifType(int):815:815 -> c
-    21:24:void visitMaxs(int,int):981:984 -> c
-    1:1:void visitVarInsn(int,int):721:721 -> d
-    2:2:void visitVarInsn(int,int):713:713 -> d
-    3:3:void visitVarInsn(int,int):709:709 -> d
-    4:8:void visitVarInsn(int,int):701:705 -> d
-    9:38:void visitVarInsn(int,int):697:726 -> d
-    39:39:void visitVarInsn(int,int):717:717 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.M0:
+    7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):417:421 -> b
+    12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):433:445 -> b
+    12:24:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):424 -> b
+    25:25:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):424:424 -> b
+    26:26:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):447:447 -> b
+    26:26:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):424 -> b
+    27:27:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):422:422 -> b
+    28:28:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.org.objectweb.asm.Label):429:429 -> b
+    29:29:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):650:650 -> b
+    30:30:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):648:648 -> b
+    31:31:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):645:645 -> b
+    32:32:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):642:642 -> b
+    33:33:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):639:639 -> b
+    34:34:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):636:636 -> b
+    35:38:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):630:633 -> b
+    39:39:com.android.tools.r8.ir.code.MemberType getMemberTypeForOpcode(int):627:627 -> b
+    40:40:void visitIntInsn(int,int):662:662 -> b
+    41:41:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):689:689 -> b
+    41:41:void visitIntInsn(int,int):663 -> b
+    42:42:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):687:687 -> b
+    42:42:void visitIntInsn(int,int):663 -> b
+    43:43:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):685:685 -> b
+    43:43:void visitIntInsn(int,int):663 -> b
+    44:44:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):683:683 -> b
+    44:44:void visitIntInsn(int,int):663 -> b
+    45:45:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):681:681 -> b
+    45:45:void visitIntInsn(int,int):663 -> b
+    46:46:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):679:679 -> b
+    46:46:void visitIntInsn(int,int):663 -> b
+    47:47:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):677:677 -> b
+    47:47:void visitIntInsn(int,int):663 -> b
+    48:48:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):675:675 -> b
+    48:48:void visitIntInsn(int,int):663 -> b
+    49:49:com.android.tools.r8.graph.DexType arrayTypeDesc(int,com.android.tools.r8.graph.DexItemFactory):673:673 -> b
+    49:49:void visitIntInsn(int,int):663 -> b
+    50:50:void visitIntInsn(int,int):663:663 -> b
+    51:55:void visitIntInsn(int,int):662:666 -> b
+    56:56:void visitIntInsn(int,int):659:659 -> b
+    57:58:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):976:977 -> b
+    1:10:void visitEnd():369:378 -> c
+    11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):34:34 -> c
+    11:11:void visitEnd():378 -> c
+    12:14:void visitEnd():378:380 -> c
+    15:15:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):429:429 -> c
+    16:16:com.android.tools.r8.ir.code.If$Type ifType(int):835:835 -> c
+    17:17:com.android.tools.r8.ir.code.If$Type ifType(int):833:833 -> c
+    18:18:com.android.tools.r8.ir.code.If$Type ifType(int):830:830 -> c
+    19:19:com.android.tools.r8.ir.code.If$Type ifType(int):827:827 -> c
+    20:20:com.android.tools.r8.ir.code.If$Type ifType(int):824:824 -> c
+    21:21:com.android.tools.r8.ir.code.If$Type ifType(int):821:821 -> c
+    22:22:com.android.tools.r8.ir.code.If$Type ifType(int):817:817 -> c
+    23:26:void visitMaxs(int,int):983:986 -> c
+    1:1:void visitVarInsn(int,int):723:723 -> d
+    2:2:void visitVarInsn(int,int):715:715 -> d
+    3:3:void visitVarInsn(int,int):711:711 -> d
+    4:8:void visitVarInsn(int,int):703:707 -> d
+    9:38:void visitVarInsn(int,int):699:728 -> d
+    39:39:void visitVarInsn(int,int):719:719 -> d
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.O0:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> j
@@ -20475,8 +20696,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():248:248 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():188:188 -> h
     1:1:java.lang.String toString():258:258 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.M0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.M0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.O0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.O0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
     boolean $assertionsDisabled -> d
@@ -20490,7 +20711,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():163:163 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():155:155 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.M0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.O0$c:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> k
@@ -20502,7 +20723,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):222:222 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
     1:7:com.android.tools.r8.graph.LazyLoadedDexApplication build():228:234 -> f
-com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.P0:
     java.util.Set pinnedMethods -> c
     com.android.tools.r8.graph.PinnedPredicate pinnedPredicate -> a
     java.util.Set pinnedInstantiations -> b
@@ -20521,7 +20742,8 @@
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.graph.O0:
+    32:35:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):58:61 -> a
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.graph.Q0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexClassAndMethod method -> a
     1:1:void <clinit>():8:8 -> <clinit>
@@ -20529,22 +20751,22 @@
     boolean isLambdaTarget() -> a
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> c
     1:1:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():30:30 -> e
-com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.P0:
+com.android.tools.r8.graph.LookupResult -> com.android.tools.r8.graph.R0:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess asLookupResultSuccess() -> a
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     1:1:void forEach(java.util.function.Consumer):32:32 -> a
     boolean isLookupResultFailure() -> b
     boolean isLookupResultSuccess() -> c
-com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.P0$a:
-com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.P0$b:
+com.android.tools.r8.graph.LookupResult$1 -> com.android.tools.r8.graph.R0$a:
+com.android.tools.r8.graph.LookupResult$LookupResultFailure -> com.android.tools.r8.graph.R0$b:
     com.android.tools.r8.graph.LookupResult$LookupResultFailure INSTANCE -> a
     1:1:void <clinit>():142:142 -> <clinit>
     1:1:void <init>():144:144 -> <init>
     void forEach(java.util.function.Consumer,java.util.function.Consumer) -> a
     boolean isLookupResultFailure() -> b
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultFailure access$100():140:140 -> d
-com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.P0$c:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess -> com.android.tools.r8.graph.R0$c:
     java.util.Map methodTargets -> a
     java.util.List lambdaTargets -> b
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState state -> c
@@ -20563,12 +20785,17 @@
     1:1:boolean isComplete():113:113 -> g
     1:1:boolean isIncomplete():109:109 -> h
     1:1:void setIncomplete():118:118 -> i
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.graph.Q0:
+com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState -> com.android.tools.r8.graph.R0$c$a:
+    com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Incomplete -> b
+    com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Complete -> a
+    1:2:void <clinit>():135:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):134:134 -> <init>
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.graph.S0:
     boolean isLambdaTarget() -> a
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> b
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> c
     boolean isMethodTarget() -> d
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.R0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.T0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(int,int):65:65 -> <init>
@@ -20614,194 +20841,216 @@
     4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):92 -> f
     5:5:void unsetDeclaredSynchronized():210:210 -> f
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):93 -> f
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.graph.S0:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.graph.U0:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> b
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:4:void <init>():19:22 -> <init>
-    1:2:void lambda$verifyNoDuplicateMethods$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):28:29 -> a
-    3:4:java.util.List directMethods():79:80 -> a
-    5:13:void addDirectMethods(java.util.Collection):85:93 -> a
-    14:15:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):116:117 -> a
-    16:169:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    16:169:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):117 -> a
-    170:170:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):118:118 -> a
-    171:175:com.android.tools.r8.graph.DexEncodedMethod removeMethodWithIndex(int,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):126:130 -> a
-    176:177:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):136:137 -> a
-    178:200:void virtualizeMethods(java.util.Set):167:189 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):194:194 -> a
-    202:355:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    202:355:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):195 -> a
-    356:356:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):204:204 -> a
-    357:359:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):246:248 -> a
-    360:361:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):254:255 -> a
-    362:515:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    362:515:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):256 -> a
-    516:518:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):257:259 -> a
-    519:525:void replaceDirectMethods(java.util.function.Function):291:297 -> a
-    1:1:java.lang.Iterable methods():74:74 -> b
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:4:void <init>():20:23 -> <init>
+    1:2:void lambda$verifyNoDuplicateMethods$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):29:30 -> a
+    3:4:java.util.List directMethods():80:81 -> a
+    3:4:java.lang.Iterable directMethods():20 -> a
+    5:13:void addDirectMethods(java.util.Collection):86:94 -> a
+    14:15:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):117:118 -> a
+    16:170:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    16:170:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):118 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):119:119 -> a
+    172:173:void removeMethods(java.util.Set):127:128 -> a
+    174:180:com.android.tools.r8.graph.DexEncodedMethod[] removeMethodsHelper(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[]):133:139 -> a
+    181:185:com.android.tools.r8.graph.DexEncodedMethod removeMethodWithIndex(int,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):144:148 -> a
+    186:187:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):154:155 -> a
+    188:188:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):212:212 -> a
+    189:343:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    189:343:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):213 -> a
+    344:344:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):222:222 -> a
+    345:347:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):264:266 -> a
+    348:349:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):272:273 -> a
+    350:504:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    350:504:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):274 -> a
+    505:507:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):275:277 -> a
+    508:514:void replaceDirectMethods(java.util.function.Function):309:315 -> a
+    1:1:java.lang.Iterable methods():75:75 -> b
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    2:2:java.lang.Iterable methods():74 -> b
-    3:11:void addVirtualMethods(java.util.Collection):148:156 -> b
-    12:13:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):161:162 -> b
-    14:14:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):219:219 -> b
-    15:16:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):224:225 -> b
-    17:20:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):230:233 -> b
-    21:22:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):269:270 -> b
-    23:176:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> b
-    23:176:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):271 -> b
-    177:181:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):272:276 -> b
-    182:183:void replaceMethods(java.util.function.Function):285:286 -> b
-    1:1:int numberOfDirectMethods():42:42 -> c
-    2:2:void lambda$removeMethod$1(com.android.tools.r8.graph.DexEncodedMethod[]):100:100 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):209:209 -> c
-    4:157:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> c
-    4:157:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):210 -> c
-    158:158:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> c
-    159:159:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> c
-    159:159:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):239 -> c
-    160:162:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):239:241 -> c
-    163:168:void replaceVirtualMethods(java.util.function.Function):304:309 -> c
-    1:1:int numberOfVirtualMethods():47:47 -> d
-    2:14:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):57:69 -> d
-    15:25:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):98:108 -> d
-    26:26:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> d
-    26:26:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):108 -> d
-    27:27:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):108:108 -> d
-    28:28:void lambda$removeMethod$2(com.android.tools.r8.graph.DexEncodedMethod[]):107:107 -> d
-    1:1:int size():52:52 -> e
-    2:2:void lambda$replaceDirectMethodWithVirtualMethod$3(com.android.tools.r8.graph.DexEncodedMethod[]):275:275 -> e
-    1:1:boolean verify():36:36 -> f
-    1:2:java.util.List virtualMethods():142:143 -> g
-    1:2:boolean verifyNoDuplicateMethods():25:26 -> h
-    3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> h
-    3:3:boolean verifyNoDuplicateMethods():26 -> h
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.T0:
+    2:2:java.lang.Iterable methods():75 -> b
+    3:11:void addVirtualMethods(java.util.Collection):166:174 -> b
+    12:13:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):179:180 -> b
+    14:36:void virtualizeMethods(java.util.Set):185:207 -> b
+    37:37:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):237:237 -> b
+    38:39:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):242:243 -> b
+    40:43:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):248:251 -> b
+    44:45:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):287:288 -> b
+    46:200:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> b
+    46:200:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):289 -> b
+    201:205:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):290:294 -> b
+    206:207:void replaceMethods(java.util.function.Function):303:304 -> b
+    1:1:int numberOfDirectMethods():43:43 -> c
+    2:2:void lambda$removeMethod$1(com.android.tools.r8.graph.DexEncodedMethod[]):101:101 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):227:227 -> c
+    4:158:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> c
+    4:158:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):228 -> c
+    159:159:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):257:257 -> c
+    160:160:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
+    160:160:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):257 -> c
+    161:163:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):257:259 -> c
+    164:169:void replaceVirtualMethods(java.util.function.Function):322:327 -> c
+    1:1:int numberOfVirtualMethods():48:48 -> d
+    2:14:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):58:70 -> d
+    15:25:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):99:109 -> d
+    26:26:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> d
+    26:26:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):109 -> d
+    27:27:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):109:109 -> d
+    28:28:void lambda$removeMethod$2(com.android.tools.r8.graph.DexEncodedMethod[]):108:108 -> d
+    1:1:int size():53:53 -> e
+    2:2:void lambda$replaceDirectMethodWithVirtualMethod$3(com.android.tools.r8.graph.DexEncodedMethod[]):293:293 -> e
+    1:1:boolean verify():37:37 -> f
+    1:2:java.util.List virtualMethods():160:161 -> g
+    1:2:java.lang.Iterable virtualMethods():20 -> g
+    1:2:boolean verifyNoDuplicateMethods():26:27 -> h
+    3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> h
+    3:3:boolean verifyNoDuplicateMethods():27 -> h
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.graph.V0:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.graph.MethodCollectionBacking backing -> b
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[]):29:29 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[]):26:37 -> <init>
-    1:1:void forEachMethod(java.util.function.Consumer):70:70 -> a
-    2:2:void forEachDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):89:89 -> a
-    3:4:void lambda$forEachDirectMethodMatching$1(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):91:92 -> a
-    5:5:java.util.List allMethodsSorted():120:120 -> a
-    6:6:int size():62:62 -> a
-    6:6:java.util.List allMethodsSorted():120 -> a
-    7:8:java.util.List allMethodsSorted():120:121 -> a
-    9:9:void forEachMethod(java.util.function.Consumer):70:70 -> a
-    9:9:java.util.List allMethodsSorted():121 -> a
-    10:10:java.util.List allMethodsSorted():122:122 -> a
-    11:11:int lambda$allMethodsSorted$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):122:122 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):145:145 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):149:149 -> a
-    14:14:void resetClassInitializerCache():161:161 -> a
-    14:14:void resetDirectMethodCaches():46 -> a
-    14:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):188 -> a
-    15:15:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):189:189 -> a
-    16:16:void resetClassInitializerCache():161:161 -> a
-    16:16:void resetDirectMethodCaches():46 -> a
-    16:16:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):194 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):195:195 -> a
-    18:18:void resetClassInitializerCache():161:161 -> a
-    18:18:void resetDirectMethodCaches():46 -> a
-    18:18:void replaceDirectMethods(java.util.function.Function):209 -> a
-    19:19:void replaceDirectMethods(java.util.function.Function):210:210 -> a
-    20:20:void addDirectMethods(java.util.Collection):227:227 -> a
-    21:21:void resetClassInitializerCache():161:161 -> a
-    21:21:void resetDirectMethodCaches():46 -> a
-    21:21:void addDirectMethods(java.util.Collection):228 -> a
-    22:22:void addDirectMethods(java.util.Collection):229:229 -> a
-    23:23:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):246:246 -> a
-    24:24:boolean verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):300:300 -> a
-    24:24:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):246 -> a
-    25:25:void resetClassInitializerCache():161:161 -> a
-    25:25:void resetDirectMethodCaches():46 -> a
-    25:25:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):247 -> a
-    26:26:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):248:248 -> a
-    27:27:void virtualizeMethods(java.util.Set):265:265 -> a
-    28:29:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):304:305 -> a
-    1:1:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):75:75 -> b
-    2:2:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> b
-    2:2:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):75 -> b
-    3:4:void lambda$forEachMethodMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):77:78 -> b
-    5:8:java.util.List directMethods():127:130 -> b
-    9:9:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):141:141 -> b
-    10:10:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):157:157 -> b
-    11:11:void resetClassInitializerCache():161:161 -> b
-    11:11:void resetDirectMethodCaches():46 -> b
-    11:11:void resetCaches():41 -> b
-    11:11:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):178 -> b
-    12:12:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):179:179 -> b
-    13:13:void resetClassInitializerCache():161:161 -> b
-    13:13:void resetDirectMethodCaches():46 -> b
-    13:13:void resetCaches():41 -> b
-    13:13:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):222 -> b
-    14:14:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):223:223 -> b
-    15:15:void resetClassInitializerCache():161:161 -> b
-    15:15:void resetDirectMethodCaches():46 -> b
-    15:15:void resetCaches():41 -> b
-    15:15:void replaceMethods(java.util.function.Function):199 -> b
-    16:16:void replaceMethods(java.util.function.Function):200:200 -> b
-    17:19:void addVirtualMethods(java.util.Collection):252:254 -> b
-    20:20:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258:258 -> b
-    21:21:boolean verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):300:300 -> b
-    21:21:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258 -> b
-    22:22:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260:260 -> b
-    1:1:void forEachVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):103:103 -> c
-    2:3:void lambda$forEachVirtualMethodMatching$2(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):105:106 -> c
-    4:4:java.lang.Iterable methods():112:112 -> c
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):116 -> c
-    5:5:java.lang.Iterable methods(java.util.function.Predicate):116:116 -> c
-    6:6:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):153:153 -> c
-    7:8:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():165:166 -> c
-    9:12:java.util.List directMethods():127:130 -> c
-    9:12:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():167 -> c
-    13:20:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():167:174 -> c
-    21:21:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):184:184 -> c
-    22:22:void replaceVirtualMethods(java.util.function.Function):205:205 -> c
-    1:1:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):66:66 -> d
-    2:4:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):233:235 -> d
-    5:5:void resetClassInitializerCache():161:161 -> d
-    5:5:void resetDirectMethodCaches():46 -> d
-    5:5:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):236 -> d
-    6:6:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):238:238 -> d
-    7:7:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> d
-    7:7:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):238 -> d
-    8:8:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):238:238 -> d
-    9:9:boolean hasAnnotations():269:269 -> d
-    10:10:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):66:66 -> d
-    10:10:boolean hasAnnotations():269 -> d
-    11:11:boolean hasAnnotations():274:274 -> d
-    12:14:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$4(com.android.tools.r8.graph.DexEncodedMethod):271:273 -> d
-    1:1:java.lang.Iterable methods():112:112 -> e
-    2:2:void lambda$verify$5(com.android.tools.r8.graph.DexEncodedMethod):280:280 -> e
-    1:1:int numberOfDirectMethods():54:54 -> f
-    2:6:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):287:291 -> f
-    1:1:int numberOfVirtualMethods():58:58 -> g
-    1:1:int size():62:62 -> h
-    1:1:boolean verify():278:278 -> i
-    2:2:void forEachMethod(java.util.function.Consumer):70:70 -> i
-    2:2:boolean verify():278 -> i
-    3:3:boolean verify():282:282 -> i
-    1:4:java.util.List virtualMethods():134:137 -> j
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.graph.U0:
-    1:1:void <init>():16:16 -> <init>
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[]):27:27 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[]):24:35 -> <init>
+    1:1:void forEachMethod(java.util.function.Consumer):88:88 -> a
+    2:2:void forEachDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):107:107 -> a
+    3:4:void lambda$forEachDirectMethodMatching$1(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):109:110 -> a
+    5:5:java.util.List allMethodsSorted():138:138 -> a
+    6:6:int size():80:80 -> a
+    6:6:java.util.List allMethodsSorted():138 -> a
+    7:8:java.util.List allMethodsSorted():138:139 -> a
+    9:9:void forEachMethod(java.util.function.Consumer):88:88 -> a
+    9:9:java.util.List allMethodsSorted():139 -> a
+    10:10:java.util.List allMethodsSorted():140:140 -> a
+    11:11:int lambda$allMethodsSorted$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):140:140 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):162:162 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):166:166 -> a
+    14:14:void resetClassInitializerCache():178:178 -> a
+    14:14:void resetDirectMethodCaches():44 -> a
+    14:14:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):205 -> a
+    15:15:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):206:206 -> a
+    16:16:void resetClassInitializerCache():178:178 -> a
+    16:16:void resetDirectMethodCaches():44 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):211 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):212:212 -> a
+    18:18:void resetClassInitializerCache():178:178 -> a
+    18:18:void resetDirectMethodCaches():44 -> a
+    18:18:void replaceDirectMethods(java.util.function.Function):226 -> a
+    19:19:void replaceDirectMethods(java.util.function.Function):227:227 -> a
+    20:20:void addDirectMethods(java.util.Collection):244:244 -> a
+    21:21:void resetClassInitializerCache():178:178 -> a
+    21:21:void resetDirectMethodCaches():44 -> a
+    21:21:void addDirectMethods(java.util.Collection):245 -> a
+    22:22:void addDirectMethods(java.util.Collection):246:246 -> a
+    23:23:void removeMethods(java.util.Set):263:263 -> a
+    24:24:void resetClassInitializerCache():178:178 -> a
+    24:24:void resetDirectMethodCaches():44 -> a
+    24:24:void removeMethods(java.util.Set):264 -> a
+    25:25:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):269:269 -> a
+    26:26:boolean verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):328:328 -> a
+    26:26:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):269 -> a
+    27:27:void resetClassInitializerCache():178:178 -> a
+    27:27:void resetDirectMethodCaches():44 -> a
+    27:27:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):270 -> a
+    28:28:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):271:271 -> a
+    29:30:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):332:333 -> a
+    1:1:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):93:93 -> b
+    2:2:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> b
+    2:2:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):93 -> b
+    3:4:void lambda$forEachMethodMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):95:96 -> b
+    5:5:java.lang.Iterable directMethods():145:145 -> b
+    6:6:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):153:153 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):174:174 -> b
+    8:8:void resetClassInitializerCache():178:178 -> b
+    8:8:void resetDirectMethodCaches():44 -> b
+    8:8:void resetCaches():39 -> b
+    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):195 -> b
+    9:9:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):196:196 -> b
+    10:10:void resetClassInitializerCache():178:178 -> b
+    10:10:void resetDirectMethodCaches():44 -> b
+    10:10:void resetCaches():39 -> b
+    10:10:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):239 -> b
+    11:11:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):240:240 -> b
+    12:12:void resetClassInitializerCache():178:178 -> b
+    12:12:void resetDirectMethodCaches():44 -> b
+    12:12:void resetCaches():39 -> b
+    12:12:void replaceMethods(java.util.function.Function):216 -> b
+    13:13:void replaceMethods(java.util.function.Function):217:217 -> b
+    14:16:void addVirtualMethods(java.util.Collection):275:277 -> b
+    17:17:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):281:281 -> b
+    18:18:boolean verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):328:328 -> b
+    18:18:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):281 -> b
+    19:19:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):283:283 -> b
+    20:20:void virtualizeMethods(java.util.Set):288:288 -> b
+    1:1:boolean hasDirectMethods(java.util.function.Predicate):60:60 -> c
+    2:2:void forEachVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):121:121 -> c
+    3:4:void lambda$forEachVirtualMethodMatching$2(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):123:124 -> c
+    5:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):170:170 -> c
+    6:7:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():182:183 -> c
+    8:8:java.lang.Iterable directMethods():145:145 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184 -> c
+    9:16:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184:191 -> c
+    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):201:201 -> c
+    18:18:void replaceVirtualMethods(java.util.function.Function):222:222 -> c
+    1:1:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):84:84 -> d
+    2:3:com.android.tools.r8.graph.DexEncodedMethod getMethod(java.util.function.Predicate):157:158 -> d
+    2:3:boolean hasMethods(java.util.function.Predicate):52 -> d
+    4:6:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):250:252 -> d
+    7:7:void resetClassInitializerCache():178:178 -> d
+    7:7:void resetDirectMethodCaches():44 -> d
+    7:7:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):253 -> d
+    8:8:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):255:255 -> d
+    9:9:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> d
+    9:9:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):255 -> d
+    10:10:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):255:255 -> d
+    11:11:boolean hasAnnotations():292:292 -> d
+    12:12:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):84:84 -> d
+    12:12:boolean hasAnnotations():292 -> d
+    13:13:boolean hasAnnotations():297:297 -> d
+    14:16:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$4(com.android.tools.r8.graph.DexEncodedMethod):294:296 -> d
+    1:1:boolean hasDirectMethods():56:56 -> e
+    2:2:boolean hasDirectMethods(java.util.function.Predicate):60:60 -> e
+    2:2:boolean hasDirectMethods():56 -> e
+    3:3:boolean hasVirtualMethods(java.util.function.Predicate):68:68 -> e
+    4:4:void lambda$verify$5(com.android.tools.r8.graph.DexEncodedMethod):308:308 -> e
+    1:1:boolean hasVirtualMethods():64:64 -> f
+    2:2:boolean hasVirtualMethods(java.util.function.Predicate):68:68 -> f
+    2:2:boolean hasVirtualMethods():64 -> f
+    3:3:java.lang.Iterable methods():130:130 -> f
+    3:3:java.lang.Iterable methods(java.util.function.Predicate):134 -> f
+    4:4:java.lang.Iterable methods(java.util.function.Predicate):134:134 -> f
+    5:9:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):315:319 -> f
+    1:1:java.lang.Iterable methods():130:130 -> g
+    1:1:int numberOfDirectMethods():72:72 -> h
+    1:1:int numberOfVirtualMethods():76:76 -> i
+    1:1:int size():80:80 -> j
+    1:1:void useSortedBacking():301:301 -> k
+    2:2:int size():80:80 -> k
+    2:2:void useSortedBacking():301 -> k
+    3:4:void useSortedBacking():301:302 -> k
+    1:1:boolean verify():306:306 -> l
+    2:2:void forEachMethod(java.util.function.Consumer):88:88 -> l
+    2:2:boolean verify():306 -> l
+    3:3:boolean verify():310:310 -> l
+    1:1:java.lang.Iterable virtualMethods():149:149 -> m
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.graph.W0:
+    1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
-    java.util.List directMethods() -> a
+    java.lang.Iterable directMethods() -> a
     com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate) -> a
+    void removeMethods(java.util.Set) -> a
     com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function) -> a
     void replaceDirectMethods(java.util.function.Function) -> a
     void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]) -> a
-    void virtualizeMethods(java.util.Set) -> a
-    1:1:void forEachMethod(java.util.function.Consumer,java.util.function.Predicate):49:49 -> a
-    2:5:com.android.tools.r8.utils.TraversalContinuation lambda$forEachMethod$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):51:54 -> a
-    6:6:void forEachDirectMethod(java.util.function.Consumer):59:59 -> a
+    1:1:void forEachMethod(java.util.function.Consumer,java.util.function.Predicate):48:48 -> a
+    2:5:com.android.tools.r8.utils.TraversalContinuation lambda$forEachMethod$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):50:53 -> a
+    6:6:void forEachDirectMethod(java.util.function.Consumer):58:58 -> a
     void addMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void addVirtualMethods(java.util.Collection) -> b
     com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod) -> b
@@ -20810,7 +21059,8 @@
     com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function) -> b
     void replaceMethods(java.util.function.Function) -> b
     void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]) -> b
-    1:1:void forEachVirtualMethod(java.util.function.Consumer):63:63 -> b
+    void virtualizeMethods(java.util.Set) -> b
+    1:1:void forEachVirtualMethod(java.util.function.Consumer):62:62 -> b
     void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod) -> c
     com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod) -> c
     int numberOfDirectMethods() -> c
@@ -20818,168 +21068,178 @@
     int numberOfVirtualMethods() -> d
     com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod) -> d
     com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function) -> d
-    1:2:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):23:24 -> d
+    1:2:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:23 -> d
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():188:188 -> d
-    3:3:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):25 -> d
+    3:3:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):24 -> d
     int size() -> e
-    1:1:boolean belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> e
+    1:1:boolean belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> e
     boolean verify() -> f
-    java.util.List virtualMethods() -> g
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.V0:
+    java.lang.Iterable virtualMethods() -> g
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.graph.X0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap methodMap -> a
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>():24:25 -> <init>
-    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> a
-    1:1:void lambda$setDirectMethods$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):225 -> a
-    2:2:void lambda$setDirectMethods$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):226:226 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    3:3:void lambda$setDirectMethods$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):226 -> a
-    4:4:void lambda$setDirectMethods$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):226:226 -> a
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap(int):35:35 -> a
-    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> a
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap(int):35 -> a
-    7:7:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):288 -> a
-    8:8:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):289:289 -> a
-    9:9:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):290 -> a
-    10:12:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):293:295 -> a
-    13:13:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):63:63 -> a
-    14:167:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    14:167:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
-    168:168:void lambda$verify$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):63:63 -> a
-    169:170:java.util.List directMethods():111:112 -> a
-    171:171:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> a
-    171:171:java.util.List directMethods():112 -> a
-    172:173:void lambda$directMethods$1(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):153 -> a
-    175:175:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    175:175:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135 -> a
-    175:175:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):153 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):153 -> a
-    177:177:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):154:154 -> a
-    178:182:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$3(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):142:146 -> a
-    183:184:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):159:160 -> a
-    185:186:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):184:185 -> a
-    187:187:void addDirectMethods(java.util.Collection):196:196 -> a
-    188:189:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):184:185 -> a
-    188:189:void addDirectMethods(java.util.Collection):197 -> a
-    190:198:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):215:223 -> a
-    199:199:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> a
-    199:199:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):223 -> a
-    200:202:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):229:231 -> a
-    203:203:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    203:203:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):231 -> a
-    204:206:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):231:233 -> a
-    207:207:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$6(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):277:277 -> a
-    208:208:void replaceDirectMethods(java.util.function.Function):277:277 -> a
-    209:209:void virtualizeMethods(java.util.Set):316:316 -> a
-    210:212:boolean verifyVirtualizedMethods(java.util.Set):320:322 -> a
-    210:212:void virtualizeMethods(java.util.Set):316 -> a
-    213:213:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> a
-    213:213:boolean verifyVirtualizedMethods(java.util.Set):322 -> a
-    213:213:void virtualizeMethods(java.util.Set):316 -> a
-    214:214:boolean verifyVirtualizedMethods(java.util.Set):322:322 -> a
-    214:214:void virtualizeMethods(java.util.Set):316 -> a
-    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> b
-    3:3:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> b
-    3:3:void lambda$virtualMethods$2(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):126 -> b
-    4:4:void lambda$virtualMethods$2(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):127:127 -> b
-    5:5:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):302 -> b
-    6:6:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):303:303 -> b
-    7:7:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):304 -> b
-    8:10:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):307:309 -> b
-    11:11:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):43:43 -> b
-    12:165:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> b
-    12:165:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):43 -> b
-    166:169:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):44:47 -> b
-    170:170:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    170:170:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):47 -> b
-    171:171:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):47:47 -> b
-    172:172:java.lang.Iterable methods():106:106 -> b
-    173:173:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> b
-    174:174:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    174:174:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135 -> b
-    175:175:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> b
-    176:177:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):171:172 -> b
-    178:178:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):177:177 -> b
-    179:179:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    179:179:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):177 -> b
-    180:181:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):178:179 -> b
-    182:183:void addVirtualMethods(java.util.Collection):203:204 -> b
-    184:192:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):238:246 -> b
-    193:193:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> b
-    193:193:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):246 -> b
-    194:196:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252:254 -> b
-    197:197:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    197:197:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):254 -> b
-    198:200:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):254:256 -> b
-    201:202:void lambda$setVirtualMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):248:249 -> b
-    203:203:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    203:203:void lambda$setVirtualMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):249 -> b
-    204:204:void lambda$setVirtualMethods$5(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):249:249 -> b
-    205:209:void replaceMethods(java.util.function.Function):263:267 -> b
-    210:212:void rehash():52:54 -> b
-    210:212:void replaceMethods(java.util.function.Function):271 -> b
-    213:213:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> b
-    213:213:void rehash():54 -> b
-    213:213:void replaceMethods(java.util.function.Function):271 -> b
-    214:216:void rehash():54:56 -> b
-    214:216:void replaceMethods(java.util.function.Function):271 -> b
-    1:1:int numberOfDirectMethods():70:70 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):165 -> c
-    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):165 -> c
-    4:4:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):135:135 -> c
-    4:4:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):165 -> c
-    5:5:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> c
-    5:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):166 -> c
-    6:15:com.android.tools.r8.graph.DexEncodedMethod getMethod(java.util.function.Predicate):139:148 -> c
-    16:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):190:190 -> c
-    17:17:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):29:29 -> c
-    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):190 -> c
-    18:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):190:191 -> c
-    20:20:void replaceVirtualMethods(java.util.function.Function):282:282 -> c
-    1:1:int numberOfVirtualMethods():75:75 -> d
-    2:3:int numberOfMethodsMatching(java.util.function.Predicate):80:81 -> d
-    4:10:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):95:101 -> d
-    11:11:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):210:210 -> d
-    12:12:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):39:39 -> d
-    12:12:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):210 -> d
-    13:13:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):210:210 -> d
-    1:1:int size():90:90 -> e
-    1:1:boolean verify():61:61 -> f
-    1:2:java.util.List virtualMethods():123:124 -> g
-    3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):45:45 -> g
-    3:3:java.util.List virtualMethods():124 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():30:30 -> h
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>():26:26 -> <init>
+    2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap):29:30 -> <init>
+    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    1:1:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):226 -> a
+    2:2:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):227:227 -> a
+    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> a
+    3:3:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):227 -> a
+    4:4:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):227:227 -> a
+    5:5:int lambda$createSorted$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):34:34 -> a
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap(int):45:45 -> a
+    7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> a
+    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap(int):45 -> a
+    8:8:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> a
+    8:8:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):289 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):290:290 -> a
+    10:10:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    10:10:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):291 -> a
+    11:13:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):294:296 -> a
+    14:14:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):73:73 -> a
+    15:169:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    15:169:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):73 -> a
+    170:170:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):73:73 -> a
+    171:171:java.lang.Iterable directMethods():121:121 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):149 -> a
+    173:173:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> a
+    173:173:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131 -> a
+    173:173:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):149 -> a
+    174:174:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> a
+    174:174:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):149 -> a
+    175:175:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):150:150 -> a
+    176:180:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$4(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):138:142 -> a
+    181:182:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):155:156 -> a
+    183:184:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):180:181 -> a
+    185:185:void addDirectMethods(java.util.Collection):192:192 -> a
+    186:187:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):180:181 -> a
+    186:187:void addDirectMethods(java.util.Collection):193 -> a
+    188:188:void removeMethods(java.util.Set):211:211 -> a
+    189:193:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):216:220 -> a
+    194:194:int size():100:100 -> a
+    194:194:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):223 -> a
+    195:196:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):223:224 -> a
+    197:197:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> a
+    197:197:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):224 -> a
+    198:200:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):230:232 -> a
+    201:201:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> a
+    201:201:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):232 -> a
+    202:204:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):232:234 -> a
+    205:205:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):278:278 -> a
+    206:206:void replaceDirectMethods(java.util.function.Function):278:278 -> a
+    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):283 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):283:283 -> b
+    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):303 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):304:304 -> b
+    5:5:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):305 -> b
+    6:8:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):308:310 -> b
+    9:9:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):53:53 -> b
+    10:164:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> b
+    10:164:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):53 -> b
+    165:168:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):54:57 -> b
+    169:169:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    169:169:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):57 -> b
+    170:170:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):57:57 -> b
+    171:171:java.lang.Iterable methods():116:116 -> b
+    172:172:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> b
+    173:173:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    173:173:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131 -> b
+    174:174:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> b
+    175:176:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):167:168 -> b
+    177:177:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> b
+    178:178:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    178:178:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):173 -> b
+    179:180:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):174:175 -> b
+    181:182:void addVirtualMethods(java.util.Collection):199:200 -> b
+    183:187:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):239:243 -> b
+    188:188:int size():100:100 -> b
+    188:188:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):246 -> b
+    189:190:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):246:247 -> b
+    191:191:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> b
+    191:191:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):247 -> b
+    192:194:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):253:255 -> b
+    195:195:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    195:195:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):255 -> b
+    196:198:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):255:257 -> b
+    199:200:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):249:250 -> b
+    201:201:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    201:201:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):250 -> b
+    202:202:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):250:250 -> b
+    203:207:void replaceMethods(java.util.function.Function):264:268 -> b
+    208:210:void rehash():62:64 -> b
+    208:210:void replaceMethods(java.util.function.Function):272 -> b
+    211:211:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    211:211:void rehash():64 -> b
+    211:211:void replaceMethods(java.util.function.Function):272 -> b
+    212:214:void rehash():64:66 -> b
+    212:214:void replaceMethods(java.util.function.Function):272 -> b
+    215:215:void virtualizeMethods(java.util.Set):317:317 -> b
+    216:218:boolean verifyVirtualizedMethods(java.util.Set):321:323 -> b
+    216:218:void virtualizeMethods(java.util.Set):317 -> b
+    219:219:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> b
+    219:219:boolean verifyVirtualizedMethods(java.util.Set):323 -> b
+    219:219:void virtualizeMethods(java.util.Set):317 -> b
+    220:220:boolean verifyVirtualizedMethods(java.util.Set):323:323 -> b
+    220:220:void virtualizeMethods(java.util.Set):317 -> b
+    1:1:int numberOfDirectMethods():80:80 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):161 -> c
+    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):161 -> c
+    4:4:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):131:131 -> c
+    4:4:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):161 -> c
+    5:5:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
+    5:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):162 -> c
+    6:15:com.android.tools.r8.graph.DexEncodedMethod getMethod(java.util.function.Predicate):135:144 -> c
+    16:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):186:186 -> c
+    17:17:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
+    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):186 -> c
+    18:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):186:187 -> c
+    20:20:void replaceVirtualMethods(java.util.function.Function):283:283 -> c
+    1:1:int numberOfVirtualMethods():85:85 -> d
+    2:3:int numberOfMethodsMatching(java.util.function.Predicate):90:91 -> d
+    4:10:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):105:111 -> d
+    11:11:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):206:206 -> d
+    12:12:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> d
+    12:12:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):206 -> d
+    13:13:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):206:206 -> d
+    1:1:int size():100:100 -> e
+    1:1:boolean verify():71:71 -> f
+    2:2:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):211:211 -> f
+    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> f
+    3:3:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):211 -> f
+    4:4:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.DexMethod):49:49 -> f
+    4:4:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):211 -> f
+    5:5:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):211:211 -> f
+    1:1:java.lang.Iterable virtualMethods():126:126 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():40:40 -> h
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>():174:174 -> h
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():30 -> h
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.W0:
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():40 -> h
+    1:2:com.android.tools.r8.graph.MethodMapBacking createSorted():34:35 -> i
+    1:1:java.util.Iterator lambda$directMethods$2():121:121 -> j
+    1:1:java.util.Iterator lambda$virtualMethods$3():126:126 -> k
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.Y0:
     com.android.tools.r8.graph.DexType nestHost -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestHost():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):23:24 -> a
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.X0:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.Z0:
     com.android.tools.r8.graph.DexType nestMember -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestMember():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):23:24 -> a
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.graph.Y0:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.b1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.graph.a1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.d1:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Map instantiatedLambdas -> d
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> c
@@ -21006,8 +21266,8 @@
     1:1:boolean isImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.graph.DexProgramClass):116:116 -> b
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):78:85 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):110:110 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.graph.Z0:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.graph.b1$a:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.graph.b1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.graph.d1$a:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():213:213 -> <clinit>
@@ -21020,7 +21280,7 @@
     14:26:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):283 -> a
     27:36:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):284:293 -> a
     37:37:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):300:300 -> a
-    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> a
     38:38:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):301 -> a
     39:41:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):301:303 -> a
     42:42:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):311:311 -> a
@@ -21059,14 +21319,14 @@
     1:3:void lambda$validate$10(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexProgramClass):437:439 -> d
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):287:287 -> e
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):363:365 -> f
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.graph.a1:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.graph.c1:
     com.android.tools.r8.shaking.GraphReporter reporter -> b
     boolean trackAllocationSites -> a
     1:1:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1):215:215 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):220:222 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):215:215 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):215:215 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.c1:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.e1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap methodHandles -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap strings -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap callSites -> i
@@ -21116,13 +21376,13 @@
     1:1:java.util.Collection getStrings():200:200 -> j
     1:1:java.util.Collection getTypes():188:188 -> k
     1:1:boolean hasJumboStrings():212:212 -> l
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.c1$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.e1$a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):120:120 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):118:122 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):126:147 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.d1:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.f1:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -21162,7 +21422,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.e1:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.g1:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -21184,13 +21444,13 @@
     1:2:boolean isMissing(int):134:135 -> g
     1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):156:168 -> h
     1:1:int hashCode():71:71 -> hashCode
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.graph.f1:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.graph.h1:
     boolean isPinned(com.android.tools.r8.graph.DexReference) -> a
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.g1:
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.i1:
     int slowCompareTo(java.lang.Object) -> a
     int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     1:1:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):14:14 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.h1:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.j1:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):32:32 -> <init>
@@ -21202,21 +21462,28 @@
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-    void visit(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.i1:
+com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.k1:
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():7:7 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):10:10 -> <init>
+    com.android.tools.r8.graph.ProgramField asProgramField() -> a
+    1:1:com.android.tools.r8.graph.DexClass getHolder():7:7 -> c
+    1:3:com.android.tools.r8.graph.DexProgramClass getHolder():29:31 -> e
+com.android.tools.r8.graph.ProgramMethod -> com.android.tools.r8.graph.l1:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):17:17 -> <init>
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView):21:22 -> a
-    3:6:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):42:45 -> a
-    7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7:7:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):45 -> a
-    8:8:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):47:47 -> a
+    3:3:boolean isStructurallyEqualTo(com.android.tools.r8.graph.ProgramMethod):38:38 -> a
+    4:7:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):42:45 -> a
+    8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8:8:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):45 -> a
+    9:9:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):47:47 -> a
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> e
     1:1:com.android.tools.r8.graph.DexClass getHolder():14:14 -> g
     boolean isProgramMethod() -> k
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():63:65 -> m
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.j1:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.m1:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
@@ -21224,7 +21491,8 @@
     com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate) -> a
     com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness):94:94 -> a
+    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness):100:100 -> a
+    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness):99:99 -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
     com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
@@ -21236,160 +21504,161 @@
     boolean isSingleResolution() -> f
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
     boolean isVirtualTarget() -> g
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.j1$a:
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.j1$b:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.m1$a:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.m1$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():723:723 -> <clinit>
-    1:1:void <init>():725:725 -> <init>
+    1:1:void <clinit>():728:728 -> <clinit>
+    1:1:void <init>():730:730 -> <init>
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):689 -> a
-    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):721 -> a
+    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):694 -> a
+    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):726 -> a
     2:2:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):698 -> a
-    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):721 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):738:738 -> a
+    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):703 -> a
+    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):726 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):743:743 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):732:732 -> b
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):737:737 -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> e
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
     boolean isVirtualTarget() -> g
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.j1$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.m1$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():783:783 -> <clinit>
-    1:1:void <init>():785:785 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.j1$d:
-    1:1:void <init>():657:657 -> <init>
-    1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):657:657 -> a
+    1:1:void <clinit>():788:788 -> <clinit>
+    1:1:void <init>():790:790 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.m1$d:
+    1:1:void <init>():662:662 -> <init>
+    1:1:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):662:662 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> d
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.j1$e:
-    1:1:void <init>():748:748 -> <init>
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.m1$e:
+    1:1:void <init>():753:753 -> <init>
     com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult asFailedResolution() -> a
     void forEachFailureDependency(java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):689 -> a
-    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):748 -> a
+    1:1:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):694 -> a
+    1:1:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):753 -> a
     2:2:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.getIncompleteEmptyResult():50:50 -> a
-    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):698 -> a
-    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):748 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):773:773 -> a
+    2:2:com.android.tools.r8.graph.LookupResult com.android.tools.r8.graph.ResolutionResult$EmptyResult.lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):703 -> a
+    2:2:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):753 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):778:778 -> a
     com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> b
-    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):767:767 -> b
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):772:772 -> b
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> c
     boolean isFailedResolution() -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> e
     com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> f
     boolean isVirtualTarget() -> g
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.j1$f:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionWithCausingMethods -> com.android.tools.r8.graph.m1$f:
     java.util.Collection methodsCausingError -> a
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):790:790 -> <init>
-    2:3:void <init>(java.util.Collection):794:795 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):800:800 -> a
-com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.j1$g:
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.graph.ResolutionResult$1):795:795 -> <init>
+    2:3:void <init>(java.util.Collection):799:800 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):805:805 -> a
+com.android.tools.r8.graph.ResolutionResult$IllegalAccessOrNoSuchMethodResult -> com.android.tools.r8.graph.m1$g:
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():829:829 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):832:833 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):829:829 -> a
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.j1$h:
+    1:1:void <clinit>():834:834 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):837:838 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):834:834 -> a
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.m1$h:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> b
-    1:2:void <clinit>():805:806 -> <clinit>
-    1:1:void <init>(java.util.Collection):809:809 -> <init>
-    1:1:void forEachFailureDependency(java.util.function.Consumer):804:804 -> a
-    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):813:815 -> a
+    1:2:void <clinit>():810:811 -> <clinit>
+    1:1:void <init>(java.util.Collection):814:814 -> <init>
+    1:1:void forEachFailureDependency(java.util.function.Consumer):809:809 -> a
+    2:4:com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult create(java.util.Collection):818:820 -> a
     boolean isIncompatibleClassChangeErrorResult() -> e
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.j1$i:
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.m1$i:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():826:826 -> <clinit>
-    1:1:void <init>():824:824 -> <init>
-com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.j1$j:
+    1:1:void <clinit>():831:831 -> <clinit>
+    1:1:void <init>():829:829 -> <init>
+com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult -> com.android.tools.r8.graph.m1$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>():114:114 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):122:131 -> <init>
-    11:11:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):130:130 -> <init>
+    1:1:void <clinit>():119:119 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):127:136 -> <init>
+    11:11:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> <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():139:139 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):273 -> a
-    2:22:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):273:293 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():139:139 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):303 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):303:303 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():144:144 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):278 -> a
+    2:22:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):278:298 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():144:144 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):308 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):308:308 -> a
     25:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):411:411 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):307 -> a
-    26:52:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):311:337 -> a
-    53:56:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):166:169 -> a
-    57:57:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):345:345 -> a
-    57:57:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):189 -> a
-    58:60:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):355:357 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):312 -> a
+    26:52:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):316:342 -> a
+    53:56:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):171:174 -> a
+    57:57:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):350:350 -> a
+    57:57:boolean lambda$lookupInvokeSpecialTarget$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):194 -> a
+    58:60:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):360:362 -> a
     61:61:com.android.tools.r8.graph.LookupResult$LookupResultFailure com.android.tools.r8.graph.LookupResult.createFailedResult():46:46 -> a
-    61:61:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):358 -> a
-    62:71:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):360:369 -> a
-    72:74:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):368:370 -> a
-    75:75:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
-    75:75:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):367 -> a
-    76:108:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):375:407 -> a
-    109:109:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
-    109:109:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):404 -> a
-    110:116:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):382:388 -> a
-    117:117:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):387:387 -> a
-    118:120:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):392:392 -> a
-    122:128:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):394:400 -> a
-    129:129:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):399:399 -> a
-    130:133:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):416:419 -> a
-    134:151:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):418:435 -> a
-    152:152:com.android.tools.r8.graph.InstantiatedSubTypeInfo instantiatedSubTypeInfoForInstantiatedType(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Box):445:445 -> a
-    153:164:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):446:457 -> a
-    165:167:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):448:450 -> a
-    168:204:void addVirtualDispatchTarget(com.android.tools.r8.graph.DexClassAndMethod,boolean,java.util.Map):470:506 -> a
-    205:207:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):518:520 -> a
-    208:208:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):526:526 -> a
-    209:209:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):532:532 -> a
-    210:363:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    210:363:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):532 -> a
-    364:376:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):533:545 -> a
-    377:377:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):597:597 -> a
-    377:377:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):547 -> a
-    378:390:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):552:564 -> a
-    391:391:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):608:608 -> a
-    391:391:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):566 -> a
-    392:392:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> a
-    392:392:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):608 -> a
-    392:392:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):566 -> a
-    393:395:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):609:611 -> a
-    393:395:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):566 -> a
-    396:397:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):567:568 -> a
-    398:404:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):619:625 -> a
-    398:404:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):568 -> a
-    405:405:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> a
-    405:405:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):625 -> a
-    405:405:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):568 -> a
-    406:408:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):627:629 -> a
-    406:408:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):568 -> a
-    409:409:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):580:580 -> a
-    410:420:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):574:584 -> a
-    421:421:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):592:592 -> a
-    421:421:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):587 -> a
-    422:429:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):646:653 -> a
+    61:61:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):363 -> a
+    62:71:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):365:374 -> a
+    72:77:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):373:378 -> a
+    78:78:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
+    78:78:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):372 -> a
+    79:111:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):380:412 -> a
+    112:112:com.android.tools.r8.graph.LookupResult$LookupResultSuccess com.android.tools.r8.graph.LookupResult.createResult(java.util.Map,java.util.List,com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):42:42 -> a
+    112:112:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.InstantiatedSubTypeInfo,com.android.tools.r8.graph.PinnedPredicate):409 -> a
+    113:119:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):387:393 -> a
+    120:120:void lambda$lookupVirtualDispatchTargets$2(com.android.tools.r8.graph.LookupCompletenessHelper,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexProgramClass):392:392 -> a
+    121:123:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):397:397 -> a
+    125:131:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):399:405 -> a
+    132:132:void lambda$lookupVirtualDispatchTargets$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.List,java.util.Map,com.android.tools.r8.ir.desugar.LambdaDescriptor):404:404 -> a
+    133:136:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):421:424 -> a
+    137:152:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):423:438 -> a
+    153:159:com.android.tools.r8.graph.LookupResult lookupVirtualDispatchTargets(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):434:440 -> a
+    160:160:com.android.tools.r8.graph.InstantiatedSubTypeInfo instantiatedSubTypeInfoForInstantiatedType(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Box):450:450 -> a
+    161:172:void lambda$instantiatedSubTypeInfoForInstantiatedType$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):451:462 -> a
+    173:175:void lambda$instantiatedSubTypeInfoForInstantiatedType$4(java.util.function.Consumer,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexProgramClass):453:455 -> a
+    176:212:void addVirtualDispatchTarget(com.android.tools.r8.graph.DexClassAndMethod,boolean,java.util.Map):475:511 -> a
+    213:215:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):523:525 -> a
+    216:216:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):531:531 -> a
+    217:217:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):537:537 -> a
+    218:372:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    218:372:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):537 -> a
+    373:385:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):538:550 -> a
+    386:386:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):602:602 -> a
+    386:386:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):552 -> a
+    387:399:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):557:569 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):613:613 -> a
+    400:400:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):571 -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod) -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):613 -> a
+    401:401:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):571 -> a
+    402:404:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):614:616 -> a
+    402:404:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):571 -> a
+    405:406:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):572:573 -> a
+    407:413:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):624:630 -> a
+    407:413:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):573 -> a
+    414:414:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):401:401 -> a
+    414:414:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):630 -> a
+    414:414:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):573 -> a
+    415:417:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):632:634 -> a
+    415:417:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):573 -> a
+    418:418:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):585:585 -> a
+    419:429:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):579:589 -> a
+    430:430:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):597:597 -> a
+    430:430:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):592 -> a
+    431:438:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):651:658 -> a
     com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult asSingleResolution() -> b
-    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):159:159 -> b
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):258:262 -> c
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):187:188 -> d
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):237:241 -> e
+    1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):164:164 -> b
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):263:267 -> c
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSpecialTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):192:193 -> d
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeStaticTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):242:246 -> e
     boolean isSingleResolution() -> f
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):212:212 -> f
-    2:2:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):345:345 -> f
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):214 -> f
-    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):218:219 -> f
-    1:1:boolean isVirtualTarget():174:174 -> g
-    1:1:com.android.tools.r8.graph.DexClassAndMethod getResolutionPair():143:143 -> h
-    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():135:135 -> i
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():139:139 -> j
-com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.k1:
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):217:217 -> f
+    2:2:boolean isSuperclass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):350:350 -> f
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):219 -> f
+    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeSuperTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):223:224 -> f
+    1:1:boolean isVirtualTarget():179:179 -> g
+    1:1:com.android.tools.r8.graph.DexClassAndMethod getResolutionPair():148:148 -> h
+    1:1:com.android.tools.r8.graph.DexClass getResolvedHolder():140:140 -> i
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():144:144 -> j
+com.android.tools.r8.graph.RewrittenPrototypeDescription -> com.android.tools.r8.graph.n1:
     com.android.tools.r8.graph.RewrittenPrototypeDescription none -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection argumentInfoCollection -> b
@@ -21419,10 +21688,10 @@
     1:1:boolean isEmpty():366:366 -> e
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription none():362:362 -> f
     1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription withExtraNullParameter():433:434 -> g
-com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.k1$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$1 -> com.android.tools.r8.graph.n1$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.k1$b:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo -> com.android.tools.r8.graph.n1$b:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo NO_INFO -> a
     1:16:void <clinit>():20:35 -> <clinit>
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo combine(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo) -> a
@@ -21431,7 +21700,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo lambda$static$0(com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):37:37 -> b
     boolean isRewrittenTypeInfo() -> c
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.k1$c:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection -> com.android.tools.r8.graph.n1$c:
     com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
@@ -21463,7 +21732,7 @@
     1:2:boolean hasRemovedArguments():199:200 -> d
     1:1:boolean isEmpty():195:195 -> e
     1:2:int numberOfRemovedArguments():209:210 -> f
-com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.k1$c$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.n1$c$a:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap argumentInfos -> a
     1:1:void <clinit>():225:225 -> <clinit>
@@ -21471,7 +21740,7 @@
     1:5:void addArgumentInfo(int,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfo):230:234 -> a
     6:9:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():238:241 -> a
     10:10:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection build():239:239 -> a
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.k1$d:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.n1$d:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -21485,7 +21754,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():97:97 -> f
     1:1:boolean isAlwaysNull():101:101 -> g
     1:1:boolean isNeverUsed():105:105 -> h
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.k1$d$a:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.n1$d$a:
     com.android.tools.r8.graph.DexType type -> b
     boolean isAlwaysNull -> a
     boolean $assertionsDisabled -> c
@@ -21494,7 +21763,7 @@
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):74:74 -> a
     2:3:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo build():79:80 -> a
     1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():69:69 -> b
-com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.k1$e:
+com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo -> com.android.tools.r8.graph.n1$e:
     com.android.tools.r8.graph.DexType newType -> c
     com.android.tools.r8.graph.DexType oldType -> b
     boolean $assertionsDisabled -> d
@@ -21508,16 +21777,16 @@
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
     1:1:com.android.tools.r8.graph.DexType getNewType():140:140 -> e
     1:1:com.android.tools.r8.graph.DexType getOldType():144:144 -> f
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.l1:
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):22:22 -> <init>
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.o1:
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
-    1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:36 -> a
-    11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):28:34 -> a
-    18:20:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):72:74 -> a
-    1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):65:67 -> b
-    1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):46:58 -> c
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.graph.m1:
+    1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:35 -> a
+    11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:33 -> a
+    18:20:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
+    1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
+    1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.graph.p1:
     java.util.Map typeInfo -> b
     java.util.Map subtypeMap -> c
     java.util.Set missingClasses -> d
@@ -21556,7 +21825,7 @@
     1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):234:234 -> h
     1:1:java.util.Set lambda$populateSuperType$1(com.android.tools.r8.graph.DexType):68:68 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):181:183 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.graph.m1$a:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.graph.p1$a:
     java.util.Set directSubtypes -> c
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
@@ -21574,12 +21843,12 @@
     1:5:boolean equals(java.lang.Object):261:265 -> equals
     1:1:int hashCode():256:256 -> hashCode
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.n1:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.q1:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
     2:2:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     3:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
-    3:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> a
+    3:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():9 -> a
     4:12:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):61:69 -> a
     13:27:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):25:39 -> a
     13:27:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
@@ -21590,14 +21859,14 @@
     30:30:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass) -> a
     30:30:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
     31:36:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):72:77 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     37:37:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):77 -> a
     38:47:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     38:47:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     48:48:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
     48:48:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     49:56:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):79:86 -> a
-    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     57:57:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):86 -> a
     58:67:boolean shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     58:67:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
@@ -21605,7 +21874,7 @@
     68:68:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
     69:69:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):88:88 -> a
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.o1:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.r1:
     1:1:void <clinit>():7:7 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):16:17 -> <init>
     1:36:void registerCallSite(com.android.tools.r8.graph.DexCallSite):108:143 -> registerCallSite
@@ -21630,12 +21899,12 @@
     1:3:void registerProto(com.android.tools.r8.graph.DexProto):149:151 -> registerProto
     1:1:boolean registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):49:49 -> registerStaticFieldReadFromMethodHandle
     1:1:boolean registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):55:55 -> registerStaticFieldWriteFromMethodHandle
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.o1$a:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.r1$a:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():12:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.p1.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.s1.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List r8InstructionSequence -> e
@@ -21657,7 +21926,7 @@
     58:79:boolean hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):133:154 -> a
     58:79:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):43 -> a
     80:80:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):44:44 -> a
-com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.graph.p1.b:
+com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.graph.s1.b:
     java.util.Map synthesizedWrappers -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> b
@@ -21668,68 +21937,67 @@
     1:1:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):38:38 -> a
     2:2:void traceInvoke(com.android.tools.r8.graph.DexMethod):42:42 -> a
     2:2:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):52 -> a
-    3:7:java.util.List generateWrappersSuperTypeMock(java.util.List):81:85 -> a
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    8:8:java.util.List generateWrappersSuperTypeMock(java.util.List):85 -> a
-    9:9:java.util.List generateWrappersSuperTypeMock(java.util.List):86:86 -> a
-    10:110:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:100 -> a
-    10:110:java.util.List generateWrappersSuperTypeMock(java.util.List):86 -> a
-    111:114:java.util.List generateWrappersSuperTypeMock(java.util.List):86:89 -> a
-    115:115:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    115:115:java.util.List generateWrappersSuperTypeMock(java.util.List):89 -> a
-    116:124:java.util.List generateWrappersSuperTypeMock(java.util.List):90:98 -> a
+    3:3:com.android.tools.r8.utils.collections.ProgramMethodSet generateCallbackMethods():71:71 -> a
+    4:8:java.util.List generateWrappersSuperTypeMock(java.util.List):81:85 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    9:9:java.util.List generateWrappersSuperTypeMock(java.util.List):85 -> a
+    10:10:java.util.List generateWrappersSuperTypeMock(java.util.List):86:86 -> a
+    11:111:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:100 -> a
+    11:111:java.util.List generateWrappersSuperTypeMock(java.util.List):86 -> a
+    112:115:java.util.List generateWrappersSuperTypeMock(java.util.List):86:89 -> a
+    116:116:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    116:116:java.util.List generateWrappersSuperTypeMock(java.util.List):89 -> a
+    117:125:java.util.List generateWrappersSuperTypeMock(java.util.List):90:98 -> a
     1:1:void traceInvoke(com.android.tools.r8.graph.DexMethod):42:42 -> b
     1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> b
-    2:2:com.android.tools.r8.utils.collections.ProgramMethodSet generateCallbackMethods():71:71 -> b
+    2:2:java.util.List generateWrappers():75:75 -> b
     1:1:void traceInvoke(com.android.tools.r8.graph.DexMethod):42:42 -> c
     1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):47 -> c
-    2:2:java.util.List generateWrappers():75:75 -> c
     1:1:void traceInvoke(com.android.tools.r8.graph.DexMethod):42:42 -> d
     1:1:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):62 -> d
     1:1:void traceInvoke(com.android.tools.r8.graph.DexMethod):42:42 -> e
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):67 -> e
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.p1.c:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.s1.c:
     1:1:void <init>():14:14 -> <init>
-    void done() -> a
+    void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing) -> a
     void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod) -> a
     void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.graph.p1.d:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.p1.f:
+com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis -> com.android.tools.r8.graph.s1.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.s1.f:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):57:61 -> <init>
-    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):66:82 -> a
-    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):80:80 -> a
-    19:19:void done():88:88 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.p1.e:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.p1.f$a:
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView):58:62 -> <init>
+    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.s1.e:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.s1.f$a:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
-    1:15:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):34:48 -> a
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    16:16:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):48 -> a
-    17:17:boolean isClassDefinitelyLoadedInInstanceMethodsOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):49:49 -> a
-com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.q1.a:
+    1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.graph.t1.a:
     java.util.Set sources -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:25 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.q1.b:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.graph.t1.b:
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.q1.c:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.graph.t1.c:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>():12:14 -> <init>
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):17:17 -> a
     2:3:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):22:23 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.q1.d:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.graph.t1.d:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
@@ -21763,7 +22031,7 @@
     1:6:com.android.tools.r8.references.FieldReference getFieldReference():25:30 -> getFieldReference
     7:12:com.android.tools.r8.references.FieldReference getFieldReference():27:32 -> getFieldReference
     1:1:java.util.Optional getInitialValue():47:47 -> getInitialValue
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> getInitialValue
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> getInitialValue
     2:2:java.util.Optional getInitialValue():47 -> getInitialValue
     3:6:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
@@ -21843,21 +22111,7 @@
     2:2:boolean com.android.tools.r8.graph.DexType.isShortType():211:211 -> isShortValue
     2:2:boolean isShortValue():99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
-com.android.tools.r8.ir.analysis.AbstractError -> com.android.tools.r8.t.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
-    boolean $assertionsDisabled -> d
-    1:4:void <clinit>():18:21 -> <clinit>
-    1:1:void <init>():25:25 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.AbstractError bottom():36:36 -> a
-    2:2:com.android.tools.r8.ir.analysis.AbstractError specific(com.android.tools.r8.graph.DexType):40:40 -> a
-    3:8:com.android.tools.r8.graph.DexType getSpecificError(com.android.tools.r8.graph.DexItemFactory):52:57 -> a
-    1:1:boolean cannotThrow():44:44 -> b
-    1:1:boolean isThrowing():48:48 -> 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.t.a.c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.s.a.b:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> e
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
@@ -21866,100 +22120,100 @@
     com.android.tools.r8.ir.code.IRCode code -> b
     1:13:void <clinit>():53:65 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1):53:53 -> <init>
-    2:2:void <init>():82:82 -> <init>
-    3:8:void <init>():79:84 -> <init>
-    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:88 -> <init>
-    10:22:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:91 -> <init>
-    1:26:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):100:125 -> a
-    27:53:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):184:210 -> a
-    27:53:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):126 -> a
-    54:65:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):127:138 -> a
-    66:66:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):137:137 -> a
-    67:69:void returnMarkingColor():229:231 -> a
-    67:69:void finish():225 -> a
-    1:1:void notifyCodeHasChanged():219:219 -> b
-    2:4:void returnMarkingColor():229:231 -> b
-    2:4:void notifyCodeHasChanged():220 -> b
-    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():96:96 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.t.a.b:
+    2:2:void <init>():81:81 -> <init>
+    3:8:void <init>():78:83 -> <init>
+    9:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):86:86 -> <init>
+    10:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):78:88 -> <init>
+    1:26:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):97:122 -> a
+    27:53:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption getAssumptionForDominator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):181:207 -> a
+    27:53:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):123 -> a
+    54:65:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):124:135 -> a
+    66:66:boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):134:134 -> a
+    67:69:void returnMarkingColor():226:228 -> a
+    67:69:void finish():222 -> a
+    1:1:void notifyCodeHasChanged():216:216 -> b
+    2:4:void returnMarkingColor():226:228 -> b
+    2:4:void notifyCodeHasChanged():217 -> b
+    1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():93:93 -> c
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.s.a.a:
     1:1:void <init>():66:66 -> <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.t.a.c$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.s.a.b$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>():56:57 -> <clinit>
     1:1:void <init>(java.lang.String,int):55:55 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.t.a.c$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.s.a.b$b:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():235:235 -> <clinit>
-    1:5:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):243:247 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    6:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):247 -> a
-    7:7:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):248:248 -> a
-    8:8: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):257:257 -> a
-    9:9: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):266:266 -> a
-    10:22: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):275:287 -> a
-    23:29: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):296:302 -> a
-    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    30:30: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):302 -> a
-    31:31: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):303:303 -> a
-    32:58: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):313:339 -> a
-    59:64:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,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):349:354 -> a
-    65:85: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):364:384 -> a
-    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    86:86: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):384 -> a
-    87:97: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):388:398 -> a
-    98:124: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):408:434 -> a
-    125:129: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):443:447 -> a
-    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    130:130: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):447 -> a
-    131:131: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):448:448 -> a
-    132:132: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):457:457 -> a
-    133:133:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):466:466 -> a
-    134:166:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):490:522 -> a
-    167:167:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    167:167:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):526 -> a
-    168:171:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):528:531 -> a
-    172:172:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):530:530 -> a
-    173:173:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):515:515 -> a
-    174:175:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):540:541 -> a
-    176:197:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):550:571 -> 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):475:481 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.t.a.c$c:
+    1:1:void <clinit>():232:232 -> <clinit>
+    1:5:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):240:244 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    6:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):244 -> a
+    7:7:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):245:245 -> a
+    8:8: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):254:254 -> a
+    9:9: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):263:263 -> a
+    10:23: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):272:285 -> a
+    24:30: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):294:300 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    31:31: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 -> a
+    32:32: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):301:301 -> a
+    33:59:boolean forInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):311:337 -> a
+    60:65:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):347:352 -> a
+    66:86:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):362:382 -> a
+    87:87:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    87:87:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):382 -> a
+    88:98:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):386:396 -> a
+    99:125:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):406:432 -> a
+    126:130: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):441:445 -> a
+    131:131:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    131:131: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):445 -> a
+    132:132: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:446 -> a
+    133:133: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):455:455 -> a
+    134:134:boolean forStaticPut(com.android.tools.r8.ir.code.StaticPut,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):464:464 -> a
+    135:167:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):489:521 -> a
+    168:168:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    168:168:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):525 -> a
+    169:172:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):527:530 -> a
+    173:173:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):529:529 -> a
+    174:174:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):514:514 -> a
+    175:176:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):539:540 -> a
+    177:198:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):549:570 -> a
+    1:8: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):473:480 -> b
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.s.a.b$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>():61:62 -> <clinit>
     1:1:void <init>(java.lang.String,int):60:60 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.t.a.d:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.s.a.c:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:48:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:69 -> a
     49:49: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.t.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.t.a.e:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.s.a.e:
+    1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:53 -> a
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.s.a.d:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
-    com.android.tools.r8.graph.DexType context -> b
+    com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():55:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):61:61 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:63 -> <init>
-    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):216:216 -> a
-    9:9:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):80 -> a
-    10:36:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):84:110 -> a
-    37:42:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):116:121 -> a
-    37:42:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):55 -> a
-    43:51:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):129:137 -> a
-    43:51:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    52:55:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):136:139 -> a
-    52:55:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):55 -> a
-    56:56:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):148:148 -> a
-    56:56:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):55 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.t.a.g:
+    1:1:void <clinit>():56:56 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):62:62 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):60:64 -> <init>
+    1:1:java.util.Set build():68:68 -> a
+    2:2:void markInitializedOnNormalExit(java.lang.Iterable):72:72 -> a
+    3:8:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):76:81 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    9:9:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):81 -> a
+    10:36:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):85:111 -> a
+    37:43:java.lang.Void handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):117:123 -> a
+    37:43:java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):56 -> a
+    44:52:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):131:139 -> a
+    44:52:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
+    53:56:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):138:141 -> a
+    53:56:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
+    57:57:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):150:150 -> a
+    57:57:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):56 -> a
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.s.a.f:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -21970,7 +22224,7 @@
     5:6:boolean check(com.android.tools.r8.ir.code.IRCode):45:46 -> a
     7:20:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):67:80 -> a
     7:20:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     21:21:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):80 -> a
     21:21:boolean check(com.android.tools.r8.ir.code.IRCode):46 -> a
     22:22:boolean check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):81:81 -> a
@@ -21984,50 +22238,50 @@
     32:34:boolean check(com.android.tools.r8.ir.code.Throw):113:115 -> a
     32:34:boolean check(com.android.tools.r8.ir.code.IRCode):54 -> a
     35:46:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):92:103 -> a
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     47:47:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):103 -> a
     48:48:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):104:104 -> a
     49:51:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):119:121 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.t.a.h:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.s.a.g:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set knownNotToDependOnEnvironment -> d
     java.util.Set visited -> e
     boolean $assertionsDisabled -> f
-    com.android.tools.r8.graph.DexType context -> c
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81:81 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:84 -> <init>
-    1:11:boolean valueMayNotDependOnEnvironmentAssumingArrayDoesNotDependOnEnvironment(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):133:143 -> a
-    12:13:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):153:154 -> a
-    14:130:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value,java.util.Set):160:276 -> a
-    131:172:boolean valueMayBeMutatedBeforeMethodExit(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):362:403 -> a
-    1:2:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):88:89 -> b
-    3:10:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):284:291 -> b
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    11:11:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):291 -> b
-    12:47:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):291:326 -> b
-    48:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> b
-    48:48:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):326 -> b
-    49:66:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):331:348 -> b
-    67:74:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):347:354 -> b
-    1:33:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):95:127 -> c
-    34:51:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):110:127 -> c
-    52:55:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):113:116 -> c
-    56:56:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> c
-    56:56:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):116 -> c
-    57:67:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):117:127 -> c
-    68:74:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):121:127 -> c
-    75:77:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):126:126 -> c
-    78:79:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):127:128 -> c
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.t.a.i.a:
+    com.android.tools.r8.graph.ProgramMethod context -> c
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:75 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:78 -> <init>
+    1:11:boolean valueMayNotDependOnEnvironmentAssumingArrayDoesNotDependOnEnvironment(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.Set):127:137 -> a
+    12:13:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):147:148 -> a
+    14:130:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value,java.util.Set):154:270 -> a
+    131:172:boolean valueMayBeMutatedBeforeMethodExit(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):356:397 -> a
+    1:2:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):82:83 -> b
+    3:10:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):278:285 -> b
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    11:11:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):285 -> b
+    12:47:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):285:320 -> b
+    48:48:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> b
+    48:48:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):320 -> b
+    49:66:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):325:342 -> b
+    67:74:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value,java.util.Set):341:348 -> b
+    1:33:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):89:121 -> c
+    34:51:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):104:121 -> c
+    52:55:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):107:110 -> c
+    56:56:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> c
+    56:56:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):110 -> c
+    57:67:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):111:121 -> c
+    68:74:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):115:121 -> c
+    75:77:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):120:120 -> c
+    78:79:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value,java.util.Set):121:122 -> c
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.s.a.h.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.t.a.i.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.s.a.h.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
@@ -22036,7 +22290,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.t.a.i.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.s.a.h.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -22052,7 +22306,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.t.a.i.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.s.a.h.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
@@ -22061,7 +22315,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.t.a.i.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.s.a.h.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -22096,19 +22350,19 @@
     58:120:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:240 -> b
     58:120:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     121:126:void setExecutableEdge(int,int):246:251 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.t.a.i.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.s.a.h.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.t.a.j.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.s.a.i.a:
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexType context -> b
+    com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):38:40 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):38:40 -> <init>
     1:1:boolean isSubsumedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):44:44 -> a
     2:5:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):51:54 -> a
     6:6:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):53:53 -> a
@@ -22136,50 +22390,52 @@
     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.t.a.k.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.s.a.j.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
     com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration configuration -> b
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):43:43 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):34:45 -> <init>
-    1:1:boolean lambda$isEscaping$0(com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):60:60 -> a
-    2:10:java.util.Set computeEscapeRoutes(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):73:81 -> a
-    11:11:boolean lambda$computeEscapeRoutes$1(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.ir.code.Instruction):78:78 -> a
-    12:31:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):86:105 -> a
-    32:48:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):125:141 -> a
-    32:48:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    49:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):178:206 -> a
-    49:77:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
-    49:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    78:93:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):142:157 -> a
-    78:93:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    94:98:com.android.tools.r8.ir.code.Value getPropagatedSubject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):216:220 -> a
-    94:98:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):160 -> a
-    94:98:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    99:100:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):162:163 -> a
-    99:100:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    101:102:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):114:115 -> a
-    103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> a
-    1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
-    10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.t.a.k.b:
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.t.a.l.a:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):44:44 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration):35:46 -> <init>
+    1:1:boolean lambda$isEscaping$0(com.android.tools.r8.utils.Box,com.android.tools.r8.ir.code.Instruction):61:61 -> a
+    2:10:java.util.Set computeEscapeRoutes(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):74:82 -> a
+    11:11:boolean lambda$computeEscapeRoutes$1(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.ir.code.Instruction):79:79 -> a
+    12:31:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):87:106 -> a
+    32:48:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):126:142 -> a
+    32:48:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
+    49:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod,java.util.List):180:208 -> a
+    49:77:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):142 -> a
+    49:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
+    78:93:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):143:158 -> a
+    78:93:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
+    94:98:com.android.tools.r8.ir.code.Value getPropagatedSubject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):218:222 -> a
+    94:98:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):161 -> a
+    94:98:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
+    99:100:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):163:164 -> a
+    99:100:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):109 -> a
+    101:102:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):115:116 -> a
+    103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
+    1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
+    10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):214:214 -> b
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.s.a.j.b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.s.a.k.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
-    1:7:void <init>(com.android.tools.r8.graph.AppView):28:34 -> <init>
-    8:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker,com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis):40:43 -> <init>
-    1:1:boolean enable(com.android.tools.r8.utils.InternalOptions):47:47 -> a
-    2:2:com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker():51:51 -> a
-    3:4:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):56:57 -> a
-    5:27:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):63:85 -> a
-    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    28:28:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):85 -> a
-    29:32:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):85:88 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.t.a.l.b:
+    1:7:void <init>(com.android.tools.r8.graph.AppView):30:36 -> <init>
+    8:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker,com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis):42:45 -> <init>
+    1:1:boolean enable(com.android.tools.r8.utils.InternalOptions):49:49 -> a
+    2:2:com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker():53:53 -> a
+    3:4:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):58:59 -> a
+    5:24:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):65:84 -> a
+    25:30:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):83:88 -> a
+    31:38:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):87:94 -> a
+    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    39:39:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94 -> a
+    40:43:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94:97 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.s.a.k.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set nonZeroFields -> d
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> b
@@ -22193,63 +22449,63 @@
     6:23:void lambda$initializeAbstractInstanceFieldValues$0(com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.DexProgramClass,java.util.Set):86:103 -> a
     24:24:void acceptClassInitializerDefaultsResult(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):113:113 -> a
     25:26:void lambda$acceptClassInitializerDefaultsResult$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):115:116 -> a
-    27:28:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):123:124 -> a
-    29:30:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):129:130 -> a
-    29:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
-    31:35:boolean verifyValueIsConsistentWithFieldOptimizationInfo(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo,com.android.tools.r8.graph.DexEncodedMethod):294:298 -> a
-    31:35:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):129 -> a
-    31:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
-    36:37:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedMethod):131:132 -> a
-    36:37:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
-    38:45:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):138:145 -> a
-    46:46:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:41 -> a
-    46:46:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):145 -> a
-    47:99:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):148:200 -> a
-    100:102:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):205:207 -> a
-    100:102:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):284 -> a
+    27:28:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):123:124 -> a
+    29:30:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):129:130 -> a
+    29:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):124 -> a
+    31:35:boolean verifyValueIsConsistentWithFieldOptimizationInfo(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo,com.android.tools.r8.graph.ProgramMethod):293:297 -> a
+    31:35:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):129 -> a
+    31:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):124 -> a
+    36:37:void recordFieldPut(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):131:132 -> a
+    36:37:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):124 -> a
+    38:45:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):137:144 -> a
+    46:46:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    46:46:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):144 -> a
+    47:99:void recordAllocationSite(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):147:199 -> a
+    100:102:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):204:206 -> a
+    100:102:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):283 -> a
     103:103:boolean isAlwaysZero(com.android.tools.r8.graph.DexEncodedField):108:108 -> a
-    103:103:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):211 -> a
-    103:103:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):284 -> a
-    104:106:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):212:212 -> a
-    104:106:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):284 -> a
-    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    107:107:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):216 -> a
-    107:107:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):284 -> a
-    108:108:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):217:217 -> a
-    108:108:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):284 -> a
-    109:129:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):223:243 -> a
-    130:140:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):242:252 -> a
-    141:157:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):259:275 -> a
-    158:158:void lambda$recordAllAllocationsSitesProcessed$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):269:269 -> a
-    159:166:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):282:289 -> a
-    167:167:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):286:286 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.t.a.l.b$a:
+    103:103:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):210 -> a
+    103:103:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):283 -> a
+    104:106:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):211:211 -> a
+    104:106:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):283 -> a
+    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    107:107:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):215 -> a
+    107:107:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):283 -> a
+    108:108:void recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):216:216 -> a
+    108:108:void lambda$waveDone$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):283 -> a
+    109:129:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):222:242 -> a
+    130:140:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):241:251 -> a
+    141:157:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):258:274 -> a
+    158:158:void lambda$recordAllAllocationsSitesProcessed$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):268:268 -> a
+    159:166:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):281:288 -> a
+    167:167:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):285:285 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.s.a.k.b$a:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():302:302 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):312:312 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView):305:316 -> <init>
-    1:10:void lambda$new$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfo):318:327 -> a
-    11:11:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    12:12:void lambda$new$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    13:20:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):333:340 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.t.a.l.b$b:
+    1:1:void <clinit>():301:301 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):311:311 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.AppView):304:315 -> <init>
+    1:12:void lambda$new$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfo):318:329 -> a
+    13:13:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):327:327 -> a
+    14:15:void lambda$new$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):327:328 -> a
+    16:23:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):335:342 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.s.a.k.b$b:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView):357:357 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView):350:360 -> <init>
-    1:4:void lambda$new$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):362:365 -> a
-    5:5:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):363:363 -> a
-    6:13:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):371:378 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.t.a.l.c:
+    1:1:void <init>(com.android.tools.r8.graph.AppView):359:359 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):352:362 -> <init>
+    1:4:void lambda$new$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:367 -> a
+    5:5:java.util.List lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):365:365 -> a
+    6:13:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):373:380 -> a
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.s.a.k.c:
     1:1:void <init>():16:16 -> <init>
     1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
     10:32:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:56 -> a
     10:32:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     33:33:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     34:50:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.t.a.l.e:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.s.a.k.e:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set fieldsOfInterest -> c
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> d
@@ -22260,42 +22516,42 @@
     2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):40:49 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> a
     2:7:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):55:60 -> a
-    8:22:void computeFieldsOfInterest():82:96 -> a
+    8:22:void computeFieldsOfInterest():83:97 -> a
     8:22:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):61 -> a
-    23:25:boolean verifyNoConstantFieldsOnSynthesizedClasses(com.android.tools.r8.graph.AppView):147:149 -> a
-    23:25:void computeFieldsOfInterest():96 -> a
+    23:25:boolean verifyNoConstantFieldsOnSynthesizedClasses(com.android.tools.r8.graph.AppView):148:150 -> a
+    23:25:void computeFieldsOfInterest():97 -> a
     23:25:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):61 -> a
-    26:33:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):62:69 -> a
-    34:36:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):100:102 -> a
-    34:36:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):70 -> a
-    37:37:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoImpl.asMutable():0:0 -> a
-    37:37:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):102 -> a
-    37:37:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):70 -> a
-    38:38:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):102:102 -> a
-    38:38:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):70 -> a
-    39:46:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):71:78 -> a
-    47:49:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):108:110 -> a
-    50:50:void processClass(com.android.tools.r8.graph.DexProgramClass):114:114 -> a
-    51:51:void lambda$processClass$0(com.android.tools.r8.graph.ProgramMethod):116:116 -> a
-    52:52:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):122:122 -> a
-    53:53:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():36:36 -> a
-    53:53:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):123 -> a
-    54:67:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):126:139 -> a
+    26:37:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):62:73 -> a
+    38:40:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):101:103 -> a
+    38:40:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):74 -> a
+    41:41:com.android.tools.r8.graph.FieldAccessInfoImpl com.android.tools.r8.graph.FieldAccessInfoImpl.asMutable():0:0 -> a
+    41:41:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):103 -> a
+    41:41:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):74 -> a
+    42:42:void clearReadsFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):103:103 -> a
+    42:42:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):74 -> a
+    43:47:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):75:79 -> a
+    48:50:void enqueueMethodsForReprocessing(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.concurrent.ExecutorService):109:111 -> a
+    51:51:void processClass(com.android.tools.r8.graph.DexProgramClass):115:115 -> a
+    52:52:void lambda$processClass$0(com.android.tools.r8.graph.ProgramMethod):117:117 -> a
+    53:53:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):123:123 -> a
+    54:54:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():36:36 -> a
+    54:54:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):124 -> a
+    55:68:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):127:140 -> a
     1:1:java.util.Set access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$200(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> c
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.t.a.l.d:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.s.a.k.d:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> b
     com.android.tools.r8.graph.ProgramMethod method -> a
-    1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):159:161 -> <init>
-    1:1:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):165:165 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    2:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):167 -> a
-    3:8:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):168:173 -> a
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):186:186 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):181:181 -> registerInstanceFieldWrite
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):191:191 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):196:196 -> registerStaticFieldWrite
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.t.a.m.a:
+    1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):160:162 -> <init>
+    1:5:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):166:170 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    6:6:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):173 -> a
+    7:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):174:179 -> a
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):192:192 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):187:187 -> registerInstanceFieldWrite
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):197:197 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):202:202 -> registerStaticFieldWrite
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.s.a.l.a:
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -22306,7 +22562,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.t.a.m.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.s.a.l.b:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -22319,7 +22575,7 @@
     4:4:boolean isEmpty():86:86 -> a
     4:4:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):71 -> a
     5:8:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):71:74 -> a
-    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
+    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):74 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):76:76 -> a
     11:11:void add(com.android.tools.r8.graph.DexEncodedField):29:29 -> a
@@ -22332,7 +22588,7 @@
     1:4:java.util.Set getFields():38:41 -> g
     1:1:int hashCode():96:96 -> hashCode
     1:1:int size():91:91 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.t.a.m.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.s.a.l.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -22342,149 +22598,140 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():18:18 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.t.a.m.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.s.a.l.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.graph.DexProgramClass clazz -> b
-    com.android.tools.r8.ir.code.DominatorTree dominatorTree -> f
-    com.android.tools.r8.graph.DexEncodedMethod method -> e
-    com.android.tools.r8.ir.code.IRCode code -> c
-    java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> g
-    java.util.Map putsPerField -> h
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> <init>
-    2:16: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):43:57 -> <init>
+    com.android.tools.r8.ir.code.DominatorTree dominatorTree -> e
+    boolean $assertionsDisabled -> h
+    com.android.tools.r8.ir.code.IRCode code -> b
+    java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> f
+    java.util.Map putsPerField -> g
+    com.android.tools.r8.graph.ProgramMethod context -> c
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):43:43 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):40:47 -> <init>
     boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField) -> a
     void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value) -> a
-    1:29:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):78:106 -> a
-    30:33:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():61:64 -> a
-    30:33:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):108 -> a
-    34:34:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):108:108 -> a
+    1:29:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):68:96 -> a
+    30:33:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():51:54 -> a
+    30:33:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):98 -> a
+    34:34:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):98:98 -> a
     35:154:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):0:119 -> a
-    35:154:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):108 -> a
-    155:155:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):113:113 -> a
-    156:156:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):123:123 -> a
-    156:156:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):114 -> a
-    157:157:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):149:149 -> a
-    157:157:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126 -> a
-    157:157:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):114 -> a
-    158:161:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():68:71 -> a
-    158:161:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):159 -> a
-    158:161:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):150 -> a
-    158:161:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126 -> a
-    158:161:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):114 -> a
-    162:162:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):159:159 -> a
-    162:162:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):150 -> a
-    162:162:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126 -> a
-    162:162:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):114 -> a
-    163:170:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):132:139 -> a
-    163:170:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):114 -> a
-    171:171:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):117:117 -> a
-    172:214:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():167:209 -> a
-    215:222:boolean verifyFieldSetContainsAllFieldReadsInBlock(com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):253:260 -> a
-    215:222:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():209 -> a
-    223:257:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():211:245 -> a
-    258:258:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):174:174 -> a
-    1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():61:64 -> b
-    5:5:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):93:93 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.t.a.m.e:
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> j
-    boolean $assertionsDisabled -> n
-    com.android.tools.r8.graph.DexEncodedMethod parentConstructor -> l
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory factory -> k
-    com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> m
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeDirect):55:55 -> <init>
-    2:20: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,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeDirect):40:58 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):72:72 -> a
-    2:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):85:89 -> a
-    2:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):74 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):89 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):74 -> a
-    8:36:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):89:117 -> a
-    8:36:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):74 -> a
-    37:37:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):75:75 -> a
-    38:38:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):127:127 -> a
-    39:39:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> a
-    39:39:boolean fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):184 -> a
-    39:39:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):127 -> a
-    40:72:boolean fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):188:220 -> a
-    40:72:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):127 -> a
-    73:73:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):128:128 -> a
-    74:74:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> a
-    74:74:boolean fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):229 -> a
-    74:74:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):141 -> a
-    75:75:boolean fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):232:232 -> a
-    75:75:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):141 -> a
-    76:79:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):142:145 -> a
-    80:84:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):144:148 -> a
-    85:132:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
-    85:132:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):148 -> a
-    133:133:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    133:133:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):122 -> a
-    134:134:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):122:122 -> a
-    135:139:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):155:159 -> a
-    140:187:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
-    140:187:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):158 -> a
-    188:190:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):163:165 -> a
-    191:238:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
-    191:238:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):165 -> a
-    239:247:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):169:177 -> a
-    248:295:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
-    248:295:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):175 -> a
-    1:6:void analyzeParentConstructorCall():133:138 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.t.a.m.f:
+    35:154:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):98 -> a
+    155:155:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):103:103 -> a
+    156:156:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):113:113 -> a
+    156:156:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):104 -> a
+    157:157:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):138:138 -> a
+    157:157:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):116 -> a
+    157:157:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):104 -> a
+    158:161:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():58:61 -> a
+    158:161:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):148 -> a
+    158:161:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):139 -> a
+    158:161:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):116 -> a
+    158:161:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):104 -> a
+    162:162:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):148:148 -> a
+    162:162:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):139 -> a
+    162:162:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):116 -> a
+    162:162:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):104 -> a
+    163:169:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):122:128 -> a
+    163:169:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):104 -> a
+    170:170:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):107:107 -> a
+    171:212:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():156:197 -> a
+    213:220:boolean verifyFieldSetContainsAllFieldReadsInBlock(com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.ProgramMethod):241:248 -> a
+    213:220:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():197 -> a
+    221:255:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():199:233 -> a
+    256:256:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):162:162 -> a
+    1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():51:54 -> b
+    5:5:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):83:83 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.s.a.l.e:
+    boolean $assertionsDisabled -> m
+    com.android.tools.r8.graph.DexEncodedMethod parentConstructor -> k
+    com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory factory -> j
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> i
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeDirect):52:52 -> <init>
+    2:18: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.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeDirect):39:55 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):68:68 -> a
+    2:27:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):80:105 -> a
+    2:27:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):70 -> a
+    28:28:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):71:71 -> a
+    29:29:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):115:115 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> a
+    30:30:boolean fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):172 -> a
+    30:30:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):115 -> a
+    31:63:boolean fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):176:208 -> a
+    31:63:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):115 -> a
+    64:64:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):116:116 -> a
+    65:65:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> a
+    65:65:boolean fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):217 -> a
+    65:65:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):129 -> a
+    66:66:boolean fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):220:220 -> a
+    66:66:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):129 -> a
+    67:70:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):130:133 -> a
+    71:75:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):132:136 -> a
+    76:123:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
+    76:123:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):136 -> a
+    124:124:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    124:124:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):110 -> a
+    125:125:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):110:110 -> a
+    126:130:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):143:147 -> a
+    131:178:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
+    131:178:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):146 -> a
+    179:181:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):151:153 -> a
+    182:229:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
+    182:229:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):153 -> a
+    230:238:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):157:165 -> a
+    239:286:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:47 -> a
+    239:286:void recordFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):163 -> a
+    1:6:void analyzeParentConstructorCall():121:126 -> c
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.s.a.l.f:
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.t.a.m.g:
-    boolean $assertionsDisabled -> j
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):46:46 -> <init>
-    1:5:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):56:60 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    6:6:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):60 -> a
-    7:10:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):60:63 -> a
-    11:13:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):68:70 -> a
-    14:24:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):72:82 -> a
-    25:33:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):79:87 -> a
-    34:41:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):84:91 -> a
-    42:45:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):106:109 -> a
-    46:53:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleFieldValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):131:138 -> a
-    46:53:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):109 -> a
-    54:71:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):109:126 -> a
-    72:72:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    72:72:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):98 -> a
-    73:74:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):99:100 -> a
-    75:76:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):210:211 -> a
-    77:77:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    77:77:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):212 -> a
-    78:80:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):215:217 -> a
-    81:81:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:41 -> a
-    81:81:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):217 -> a
-    82:82:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    82:82:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):219 -> a
-    83:83:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):222:222 -> a
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.s.a.l.g:
+    boolean $assertionsDisabled -> i
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):41:41 -> <init>
+    1:7:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):50:56 -> a
+    8:10:void computeFieldOptimizationInfo(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult):61:63 -> a
+    11:21:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):65:75 -> a
+    22:30:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):72:80 -> a
+    31:38:void lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexValue):77:84 -> a
+    39:42:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):99:102 -> a
+    43:50:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleFieldValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):124:131 -> a
+    43:50:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):102 -> a
+    51:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):102:119 -> a
+    69:69:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    69:69:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):91 -> a
+    70:71:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):92:93 -> a
+    72:73:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):205:206 -> a
+    74:74:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    74:74:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):207 -> a
+    75:77:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):210:212 -> a
+    78:78:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    78:78:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):212 -> a
+    79:79:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    79:79:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):214 -> a
+    80:80:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):217:217 -> a
+    81:81:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    81:81:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):219 -> a
+    82:83:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):223:224 -> a
     84:84:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    84:84:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):224 -> a
-    85:86:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):228:229 -> a
-    87:87:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    87:87:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):230 -> a
-    88:88:com.android.tools.r8.ir.analysis.value.ObjectState$Builder com.android.tools.r8.ir.analysis.value.ObjectState.builder():18:18 -> a
-    88:88:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):233 -> a
-    89:105:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):234:250 -> a
-    106:116:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):237:247 -> a
-    1:37:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):151:187 -> b
-    38:40:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):178:180 -> b
-    41:42:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):170:171 -> b
-    43:48:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):254:259 -> b
-    43:48:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):171 -> b
-    49:67:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):257:275 -> b
-    49:67:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):171 -> b
-    68:70:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):204:206 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.t.a.m.h:
+    84:84:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):225 -> a
+    85:85:com.android.tools.r8.ir.analysis.value.ObjectState$Builder com.android.tools.r8.ir.analysis.value.ObjectState.builder():18:18 -> a
+    85:85:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):228 -> a
+    86:102:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):229:245 -> a
+    103:113:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):232:242 -> a
+    1:39:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):144:182 -> b
+    40:42:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):172:174 -> b
+    43:44:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):164:165 -> b
+    45:50:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):249:254 -> b
+    45:50:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):165 -> b
+    51:69:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):252:270 -> b
+    51:69:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):165 -> b
+    70:72:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):199:201 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.s.a.l.h:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -22492,51 +22739,50 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():18:18 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.t.a.n.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.s.a.m.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.t.a.o.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.s.a.n.b:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesWithRemovedExtensionFields -> c
     java.util.Set removedExtensionFields -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):77:77 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):73:80 -> <init>
-    1:2:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):94:95 -> a
-    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):105:115 -> a
-    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):96 -> a
-    14:17:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):124:127 -> a
-    18:29:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):132:143 -> a
-    30:30:boolean wasRemoved(com.android.tools.r8.graph.DexField):148:148 -> a
-    30:30:boolean lambda$run$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):95 -> a
-    31:40:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):154:163 -> a
-    41:42:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):160:161 -> a
-    43:43:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
-    44:44:void lambda$forEachFindLiteExtensionByNumberMethod$3(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):172:172 -> a
-    45:45:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> a
-    46:46:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():257:257 -> a
-    46:46:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):174 -> a
-    47:47:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):174:174 -> a
-    48:48:void lambda$forEachFindLiteExtensionByNumberMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):177:177 -> a
-    49:53:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):182:186 -> a
-    54:54:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):185:185 -> a
-    55:64:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):195:204 -> a
-    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    65:65:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):204 -> a
-    66:77:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):205:216 -> a
-    78:80:void forEachDeadProtoExtensionField(java.util.function.Consumer):220:222 -> a
-    81:83:void lambda$forEachDeadProtoExtensionField$5(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):224:226 -> a
-    1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):100:101 -> b
-    3:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):167:169 -> b
-    1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):148:148 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.t.a.o.a:
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):78:78 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):74:81 -> <init>
+    1:2:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):95:96 -> a
+    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):106:116 -> a
+    3:13:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):97 -> a
+    14:17:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125:128 -> a
+    18:29:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):133:144 -> a
+    30:30:boolean wasRemoved(com.android.tools.r8.graph.DexField):149:149 -> a
+    30:30:boolean lambda$run$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):96 -> a
+    31:43:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):155:167 -> a
+    44:44:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):163:163 -> a
+    45:45:void lambda$postOptimizeGeneratedExtensionRegistry$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):161:161 -> a
+    46:50:void lambda$forEachFindLiteExtensionByNumberMethod$3(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):176:176 -> a
+    51:51:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
+    52:52:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> a
+    52:52:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178 -> a
+    53:53:boolean lambda$forEachFindLiteExtensionByNumberMethod$2(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
+    54:54:void lambda$forEachFindLiteExtensionByNumberMethod$4(com.android.tools.r8.ir.desugar.LambdaDescriptor):181:181 -> a
+    55:62:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):186:193 -> a
+    63:63:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):192:192 -> a
+    64:78:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):202:216 -> a
+    79:223:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):0:144 -> a
+    79:223:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,java.util.Set):217 -> a
+    224:226:void forEachDeadProtoExtensionField(java.util.function.Consumer):221:223 -> a
+    227:229:void lambda$forEachDeadProtoExtensionField$5(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):225:227 -> a
+    1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):101:102 -> b
+    3:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):171:173 -> b
+    1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):149:149 -> c
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.s.a.n.a:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):106:106 -> <init>
-    1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):111:111 -> isReachableOrReferencedField
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.t.a.o.f:
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):107:107 -> <init>
+    1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112:112 -> isReachableOrReferencedField
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.s.a.n.f:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     java.util.Map builders -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -22558,61 +22804,62 @@
     43:173:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):0:130 -> a
     43:173:void preprocessCallGraphBeforeCycleElimination(java.util.Map):135 -> a
     174:178:void preprocessCallGraphBeforeCycleElimination(java.util.Map):136:140 -> a
-    179:188:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):152:161 -> a
-    189:189:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):195:195 -> a
-    190:1204:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    190:1204:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):196 -> a
-    1205:1215:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):198:208 -> a
-    1216:1216:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):126:126 -> a
-    1216:1216:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):209 -> a
-    1217:1219:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):212:214 -> a
-    1220:1531:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):0:311 -> a
-    1220:1531:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):214 -> a
-    1532:1532:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):304:304 -> a
-    1532:1532:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):311 -> a
-    1532:1532:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):214 -> a
-    1533:1537:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):218:222 -> a
-    1538:1538:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
-    1538:1538:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):223 -> a
-    1539:1546:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):223:230 -> a
-    1547:1547:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    1547:1547:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):230 -> a
-    1548:1548:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):230:230 -> a
+    179:184:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):152:157 -> a
+    185:191:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):156:162 -> a
+    192:192:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):196:196 -> a
+    193:1207:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
+    193:1207:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):197 -> a
+    1208:1218:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):199:209 -> a
+    1219:1219:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):126:126 -> a
+    1219:1219:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):210 -> a
+    1220:1222:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):213:215 -> a
+    1223:1538:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):0:315 -> a
+    1223:1538:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):215 -> a
+    1539:1539:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):308:308 -> a
+    1539:1539:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):315 -> a
+    1539:1539:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):215 -> a
+    1540:1544:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):219:223 -> a
+    1545:1545:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
+    1545:1545:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):224 -> a
+    1546:1553:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):224:231 -> a
+    1554:1554:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    1554:1554:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):231 -> a
+    1555:1555:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):231:231 -> a
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):52:52 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.t.a.o.c:
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$MethodToInvokeSwitchCaseAnalyzer -> com.android.tools.r8.t.a.o.d:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.s.a.n.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$MethodToInvokeSwitchCaseAnalyzer -> com.android.tools.r8.s.a.n.d:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> d
     boolean $assertionsDisabled -> e
     int newBuilderOrdinal -> c
-    1:1:void <clinit>():234:234 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1):234:234 -> <init>
-    2:13:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):238:249 -> <init>
-    1:1:boolean isInitialized():253:253 -> b
-    2:19:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,int):258:275 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.t.a.o.e:
+    1:1:void <clinit>():235:235 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1):235:235 -> <init>
+    2:13:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):239:250 -> <init>
+    1:1:boolean isInitialized():254:254 -> b
+    2:19:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,int):259:276 -> b
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.s.a.n.e:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set neverMerge -> d
     java.util.Set alwaysInline -> e
     java.util.Set bypassClinitforInlining -> f
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> c
-    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set):295:301 -> <init>
-    1:1:void alwaysClassInlineGeneratedMessageLiteBuilders():319:319 -> a
-    2:3:boolean lambda$alwaysClassInlineGeneratedMessageLiteBuilders$0(com.android.tools.r8.graph.DexType):322:323 -> a
-    4:5:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):327:328 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    6:6:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):328 -> a
-    7:13:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):328:334 -> a
-    14:14:boolean lambda$bypassClinitforInliningNewBuilderMethods$1(com.android.tools.r8.graph.DexEncodedMethod):332:332 -> a
-    1:1:void extend(com.android.tools.r8.graph.SubtypingInfo):305:305 -> b
-    2:2:void alwaysInlineCreateBuilderFromGeneratedMessageLite():345:345 -> b
-    2:2:void extend(com.android.tools.r8.graph.SubtypingInfo):308 -> b
-    3:3:void extend(com.android.tools.r8.graph.SubtypingInfo):311:311 -> b
-    4:4:void alwaysInlineBuildPartialFromGeneratedMessageLiteExtendableBuilder():341:341 -> b
-    4:4:void extend(com.android.tools.r8.graph.SubtypingInfo):314 -> b
-    5:6:void neverMergeGeneratedMessageLiteBuilder():352:353 -> b
-    5:6:void extend(com.android.tools.r8.graph.SubtypingInfo):315 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.t.a.o.g:
+    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set):296:302 -> <init>
+    1:1:void alwaysClassInlineGeneratedMessageLiteBuilders():320:320 -> a
+    2:3:boolean lambda$alwaysClassInlineGeneratedMessageLiteBuilders$0(com.android.tools.r8.graph.DexType):323:324 -> a
+    4:5:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):328:329 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    6:6:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):329 -> a
+    7:13:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):329:335 -> a
+    14:14:boolean lambda$bypassClinitforInliningNewBuilderMethods$1(com.android.tools.r8.graph.DexEncodedMethod):333:333 -> a
+    1:1:void extend(com.android.tools.r8.graph.SubtypingInfo):306:306 -> b
+    2:2:void alwaysInlineCreateBuilderFromGeneratedMessageLite():346:346 -> b
+    2:2:void extend(com.android.tools.r8.graph.SubtypingInfo):309 -> b
+    3:3:void extend(com.android.tools.r8.graph.SubtypingInfo):312:312 -> b
+    4:4:void alwaysInlineBuildPartialFromGeneratedMessageLiteExtendableBuilder():342:342 -> b
+    4:4:void extend(com.android.tools.r8.graph.SubtypingInfo):315 -> b
+    5:6:void neverMergeGeneratedMessageLiteBuilder():353:354 -> b
+    5:6:void extend(com.android.tools.r8.graph.SubtypingInfo):316 -> b
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.s.a.n.g:
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -22625,96 +22872,96 @@
     1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder,com.android.tools.r8.ir.analysis.proto.ProtoReferences):56:66 -> <init>
     12:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder,com.android.tools.r8.ir.analysis.proto.ProtoReferences):65:67 -> <init>
     1:2:void run(com.android.tools.r8.ir.code.IRCode):71:72 -> a
-    3:11:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):121:129 -> a
+    3:11:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):123:131 -> a
     3:11:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    12:12:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):154:154 -> a
-    12:12:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):148 -> a
-    12:12:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    12:12:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156:156 -> a
+    12:12:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    12:12:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     12:12:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    13:13:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
-    13:13:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):148 -> a
-    13:13:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    13:13:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):158 -> a
+    13:13:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    13:13:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     13:13:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    14:14:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156:156 -> a
-    14:14:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):148 -> a
-    14:14:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    14:14:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):158:158 -> a
+    14:14:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    14:14:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     14:14:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    15:15:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> a
-    15:15:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):154 -> a
-    15:15:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):148 -> a
-    15:15:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    15:15:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> a
+    15:15:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
+    15:15:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    15:15:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     15:15:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    16:16:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> a
-    16:16:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):154 -> a
-    16:16:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):148 -> a
-    16:16:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    16:16:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> a
+    16:16:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
+    16:16:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    16:16:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     16:16:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    17:19:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):165:167 -> a
-    17:19:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    17:19:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    17:19:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):167:169 -> a
+    17:19:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    17:19:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     17:19:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():30:30 -> a
-    20:20:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):167 -> a
-    20:20:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    20:20:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    20:20:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):169 -> a
+    20:20:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    20:20:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     20:20:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    21:28:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):168:175 -> a
-    21:28:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    21:28:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    21:28:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):170:177 -> a
+    21:28:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    21:28:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     21:28:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    29:29:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):175 -> a
-    29:29:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    29:29:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    29:29:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):177 -> a
+    29:29:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    29:29:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     29:29:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    30:31:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):176:177 -> a
-    30:31:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    30:31:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    30:31:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):178:179 -> a
+    30:31:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    30:31:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     30:31:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     32:32:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> a
-    32:32:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):176 -> a
-    32:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    32:32:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    32:32:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):178 -> a
+    32:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    32:32:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     32:32:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    33:35:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):180:182 -> a
-    33:35:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    33:35:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    33:35:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):182:184 -> a
+    33:35:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    33:35:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     33:35:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> a
-    36:36:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):183 -> a
-    36:36:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    36:36:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    36:36:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):185 -> a
+    36:36:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    36:36:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     36:36:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    37:39:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):184:186 -> a
-    37:39:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    37:39:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    37:39:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186:188 -> a
+    37:39:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    37:39:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     37:39:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> a
-    40:40:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):184 -> a
-    40:40:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    40:40:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    40:40:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186 -> a
+    40:40:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    40:40:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     40:40:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    41:41:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):191:191 -> a
-    41:41:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    41:41:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    41:41:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193:193 -> a
+    41:41:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    41:41:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     41:41:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     42:44:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
-    42:44:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):191 -> a
-    42:44:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):149 -> a
-    42:44:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):132 -> a
+    42:44:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193 -> a
+    42:44:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    42:44:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     42:44:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    45:48:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):135:138 -> a
+    45:48:void rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):137:140 -> a
     45:48:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    49:58:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):80:89 -> a
-    59:60:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):86:87 -> a
-    61:61:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):84:84 -> a
-    62:65:void forEachDynamicMethod(java.util.function.Consumer):93:96 -> a
-    66:71:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):99:104 -> a
-    72:72:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):108:108 -> a
-    73:76:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):196:199 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.t.a.o.h:
+    49:60:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):80:91 -> a
+    61:61:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):87:87 -> a
+    62:62:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):85:85 -> a
+    63:66:void forEachDynamicMethod(java.util.function.Consumer):95:98 -> a
+    67:72:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):101:106 -> a
+    73:73:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):110:110 -> a
+    74:77:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):198:201 -> a
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.s.a.n.h:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -22722,7 +22969,7 @@
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():29:29 -> a
     1:5:boolean registerConstClass(com.android.tools.r8.graph.DexType):41:45 -> registerConstClass
     1:5:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):57:61 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.t.a.o.i:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.s.a.n.i:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -22740,17 +22987,17 @@
     378:378:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
     379:392:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):53:66 -> a
     379:392:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-    393:393:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):315:315 -> a
+    393:393:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithSimpleBody(com.android.tools.r8.graph.DexField):319:319 -> a
     393:393:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):67 -> a
     393:393:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     394:397:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):68:71 -> a
     394:397:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-    398:398:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):323:323 -> a
+    398:398:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isMethodToInvokeWithNonSimpleBody(com.android.tools.r8.graph.DexField):327:327 -> a
     398:398:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):72 -> a
     398:398:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     399:402:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod):71:74 -> a
     399:402:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.t.a.o.j:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.s.a.n.j:
     com.android.tools.r8.graph.DexType wireFormatFieldType -> l
     com.android.tools.r8.graph.DexType messageLiteType -> j
     com.android.tools.r8.graph.DexString dynamicMethodName -> r
@@ -22781,44 +23028,44 @@
     52:63:void <init>(com.android.tools.r8.graph.DexItemFactory):94:105 -> <init>
     1:1:boolean isDynamicMethod(com.android.tools.r8.graph.DexMethod):114:114 -> a
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> a
-    3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):144:144 -> a
+    3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):148:148 -> a
     4:4:boolean isAbstractGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):109:109 -> a
-    4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):146 -> a
+    4:4:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):150 -> a
     1:1:boolean isDynamicMethodBridge(com.android.tools.r8.graph.DexMethod):126:126 -> b
     1:2:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):138:139 -> c
-    1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):150:150 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.t.a.o.j$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.t.a.o.j$b:
+    1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):154:154 -> d
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.s.a.n.j$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.s.a.n.j$b:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):153:153 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):158:162 -> <init>
-    7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):160:172 -> <init>
-    20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):170:170 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.t.a.o.j$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):157:157 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):162:166 -> <init>
+    7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):164:176 -> <init>
+    20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):174:174 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.s.a.n.j$c:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
-    1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):240:240 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):245:249 -> <init>
-    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):247:254 -> <init>
-    15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):252:252 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.t.a.o.j$d:
+    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):244:244 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):249:253 -> <init>
+    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):251:258 -> <init>
+    15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):256:256 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.s.a.n.j$d:
     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):259:259 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):263:267 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:265 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.t.a.o.j$e:
+    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):263:263 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):267:271 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):269:269 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.s.a.n.j$e:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> c
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethod -> b
     com.android.tools.r8.graph.DexMethod createBuilderMethod -> 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):187:187 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):195:199 -> <init>
-    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):197:204 -> <init>
-    15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):202:209 -> <init>
-    23:30:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):207:214 -> <init>
-    31:46:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):212:227 -> <init>
-    47:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):225:225 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.t.a.o.j$f:
+    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):191:191 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):199:203 -> <init>
+    7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):201:208 -> <init>
+    15:22:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):206:213 -> <init>
+    23:30:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:218 -> <init>
+    31:46:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):216:231 -> <init>
+    47:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):229:229 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.s.a.n.j$f:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -22826,9 +23073,9 @@
     com.android.tools.r8.graph.DexField buildMessageInfoField -> a
     com.android.tools.r8.graph.DexField getParserField -> d
     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):272:272 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):282:299 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.t.a.o.k:
+    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):276:276 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):286:303 -> <init>
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.s.a.n.k:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     java.util.Set deadProtoTypes -> g
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
@@ -22842,18 +23089,18 @@
     2:21:void <init>(com.android.tools.r8.graph.AppView):25:44 -> <init>
     1:1:java.util.Set getDeadProtoTypes():48:48 -> a
     2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):58:60 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():714:714 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():715:715 -> a
     5:5:void setDeadProtoTypes(java.util.Set):53 -> a
     6:6:void setDeadProtoTypes(java.util.Set):54:54 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():715:715 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():716:716 -> a
     7:7:void setDeadProtoTypes(java.util.Set):53 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.t.a.o.l:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.s.a.n.l:
     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.t.a.o.n:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.s.a.n.n:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -22883,7 +23130,7 @@
     2:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:320 -> b
     22:22:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):313:313 -> b
     23:23:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):302:302 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.t.a.o.m:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.s.a.n.m:
     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):255:257 -> <init>
@@ -22896,7 +23143,7 @@
     9:9:int nextInt():287:287 -> b
     10:10:int nextInt():276:276 -> b
     11:11:int nextInt():267:267 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.t.a.o.n$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.s.a.n.n$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -22911,10 +23158,10 @@
     16:16:java.lang.Object next():320 -> b
     17:17:com.android.tools.r8.ir.code.Value next():342:342 -> b
     17:17:java.lang.Object next():320 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.t.a.o.n$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.s.a.n.n$b:
     1:1:void <init>():365:365 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):365:365 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.t.a.o.o:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.s.a.n.o:
     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
@@ -22927,14 +23174,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.t.a.o.p.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.s.a.n.p.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.t.a.o.p.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.s.a.n.p.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
@@ -22945,7 +23192,7 @@
     boolean isLiveProtoFieldObject() -> f
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> j
     1:1:java.lang.String toString():55:55 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.t.a.o.p.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.s.a.n.p.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
@@ -22957,110 +23204,106 @@
     java.util.Map seenButNotLiveProtos -> f
     java.util.Map reachesMapOrRequiredFieldFromMessageCache -> g
     com.android.tools.r8.utils.collections.ProgramMethodSet findLiteExtensionByNumberMethods -> i
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):88:88 -> <init>
-    2:30:void <init>(com.android.tools.r8.graph.AppView):65:93 -> <init>
-    1:3:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):98:100 -> a
-    4:14:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):107:117 -> a
-    4:14:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):101 -> a
-    15:22:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):113:120 -> a
-    15:22:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):101 -> a
-    23:28:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):130:135 -> a
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):90:90 -> <init>
+    2:30:void <init>(com.android.tools.r8.graph.AppView):67:95 -> <init>
+    1:3:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):100:102 -> a
+    4:14:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):109:119 -> a
+    4:14:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):103 -> a
+    15:22:void markGeneratedMessageLiteSubtypeAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):115:122 -> a
+    15:22:void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist):103 -> a
+    23:28:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):132:137 -> a
     29:151:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethod(com.android.tools.r8.graph.ProgramMethod):0:122 -> a
-    29:151:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):135 -> a
-    152:162:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):139:149 -> a
-    163:171:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):154:162 -> a
-    172:184:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):167:179 -> a
-    185:210:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):457:482 -> a
-    185:210:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):180 -> a
-    211:215:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):481:485 -> a
-    211:215:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):180 -> a
-    216:216:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):484:484 -> a
-    216:216:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):180 -> a
-    217:217:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):183:183 -> a
-    218:242:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):212:236 -> a
-    243:259:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:231 -> a
-    260:260:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):274:274 -> a
-    261:269:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):293:301 -> a
-    270:270:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:41 -> a
-    270:270:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):301 -> a
-    271:288:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):303:320 -> a
-    289:289:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):183:183 -> a
-    289:289:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):320 -> a
-    290:307:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):321:338 -> a
-    308:310:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):337:339 -> a
-    311:311:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):332:332 -> a
-    312:341:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):351:380 -> a
-    342:377:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):379:414 -> a
-    378:379:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):135:136 -> a
-    378:379:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):415 -> a
-    380:410:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):416:446 -> a
-    411:411:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):443:443 -> a
-    412:416:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):496:500 -> a
-    412:416:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451 -> a
-    417:431:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):508:522 -> a
-    417:431:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):501 -> a
-    417:431:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451 -> a
-    432:432:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    432:432:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):522 -> a
-    432:432:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):501 -> a
-    432:432:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451 -> a
-    433:469:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):522:558 -> a
-    433:469:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):501 -> a
-    433:469:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451 -> a
-    470:470:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):557:557 -> a
-    470:470:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):501 -> a
-    470:470:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):451 -> a
-    471:472:boolean lambda$markMapOrRequiredFieldsAsReachable$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):433:434 -> a
-    473:493:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):568:588 -> a
-    494:500:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):599:605 -> a
-    501:527:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):604:630 -> a
-    528:536:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):639:647 -> a
-    537:537:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    537:537:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):647 -> a
-    538:552:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):647:661 -> a
-    1:24:java.util.Map collectExtensionFields():244:267 -> b
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    25:25:java.util.Map collectExtensionFields():267 -> b
-    26:40:java.util.Map collectExtensionFields():267:281 -> b
-    41:41:java.util.Map collectExtensionFields():280:280 -> b
-    42:42:java.util.Map collectExtensionFields():279:279 -> b
-    43:43:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):338:338 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.t.a.o.p.d:
+    29:151:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):137 -> a
+    152:162:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):141:151 -> a
+    163:171:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map):156:164 -> a
+    172:184:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):169:181 -> a
+    185:210:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):460:485 -> a
+    185:210:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):182 -> a
+    211:215:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):484:488 -> a
+    211:215:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):182 -> a
+    216:216:void tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):487:487 -> a
+    216:216:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):182 -> a
+    217:217:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):185:185 -> a
+    218:234:void lambda$populateExtensionGraph$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):217:233 -> a
+    235:259:java.util.Map collectExtensionFields():246:270 -> a
+    260:260:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    260:260:java.util.Map collectExtensionFields():270 -> a
+    261:275:java.util.Map collectExtensionFields():270:284 -> a
+    276:276:java.util.Map collectExtensionFields():283:283 -> a
+    277:277:java.util.Map collectExtensionFields():282:282 -> a
+    278:278:java.util.Set lambda$collectExtensionFields$1(com.android.tools.r8.graph.DexProgramClass):277:277 -> a
+    279:287:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):296:304 -> a
+    288:288:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    288:288:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):304 -> a
+    289:306:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):306:323 -> a
+    307:307:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods.isConstructor(com.android.tools.r8.graph.DexMethod):187:187 -> a
+    307:307:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):323 -> a
+    308:325:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):324:341 -> a
+    326:328:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):340:342 -> a
+    329:329:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):335:335 -> a
+    330:359:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):354:383 -> a
+    360:396:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):382:418 -> a
+    397:398:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):143:144 -> a
+    397:398:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):419 -> a
+    399:428:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):420:449 -> a
+    429:429:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):447:447 -> a
+    430:434:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):499:503 -> a
+    430:434:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):454 -> a
+    435:493:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):511:569 -> a
+    435:493:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):504 -> a
+    435:493:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):454 -> a
+    494:494:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):568:568 -> a
+    494:494:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):504 -> a
+    494:494:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):454 -> a
+    495:495:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):563:563 -> a
+    495:495:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):504 -> a
+    495:495:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):454 -> a
+    496:497:boolean lambda$markMapOrRequiredFieldsAsReachable$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):437:438 -> a
+    498:518:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):579:599 -> a
+    519:525:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):610:616 -> a
+    526:552:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):615:641 -> a
+    553:561:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):650:658 -> a
+    562:562:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    562:562:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):658 -> a
+    563:577:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):658:672 -> a
+    1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):214:238 -> b
+    26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):341:341 -> b
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.s.a.n.p.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
     java.util.OptionalInt auxData -> c
     int number -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:5:void <init>(int,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType,java.util.OptionalInt,java.util.List):34:38 -> <init>
-    1:1:int getAuxData():46:46 -> a
-    2:2:boolean hasAuxData():42:42 -> a
-    2:2:int getAuxData():46 -> a
-    3:4:int getAuxData():46:47 -> a
-    5:5:void setAuxData(int):51:51 -> a
-    6:6:boolean hasAuxData():42:42 -> a
-    6:6:void setAuxData(int):51 -> a
-    7:8:void setAuxData(int):51:52 -> a
-    9:10:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):76:77 -> a
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:5:void <init>(int,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType,java.util.OptionalInt,java.util.List):36:40 -> <init>
+    1:1:int getAuxData():48:48 -> a
+    2:2:boolean hasAuxData():44:44 -> a
+    2:2:int getAuxData():48 -> a
+    3:4:int getAuxData():48:49 -> a
+    5:5:void setAuxData(int):53:53 -> a
+    6:6:boolean hasAuxData():44:44 -> a
+    6:6:void setAuxData(int):53 -> a
+    7:8:void setAuxData(int):53:54 -> a
+    9:10:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):78:79 -> a
     11:11:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType.getActualFieldType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):22:22 -> a
-    11:11:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):77 -> a
-    12:27:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):78:93 -> a
-    28:30:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):86:88 -> a
-    31:31:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):120:120 -> a
-    32:39:com.android.tools.r8.graph.DexEncodedField getHazzerBitField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):124:131 -> a
-    1:1:int getNumber():56:56 -> b
-    2:6:com.android.tools.r8.graph.DexEncodedField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):166:170 -> b
-    1:1:java.util.List getObjects():60:60 -> c
-    2:6:com.android.tools.r8.graph.DexEncodedField getValueStorage(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):181:185 -> c
-    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.t.a.o.p.e:
+    11:11:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):79 -> a
+    12:27:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):80:95 -> a
+    28:30:com.android.tools.r8.graph.DexType getBaseMessageType(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory):88:90 -> a
+    31:31:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):122:122 -> a
+    32:42:com.android.tools.r8.graph.ProgramField getHazzerBitField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):127:137 -> a
+    1:1:int getNumber():58:58 -> b
+    2:8:com.android.tools.r8.graph.ProgramField getOneOfCaseField(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):175:181 -> b
+    1:1:java.util.List getObjects():62:62 -> c
+    2:9:com.android.tools.r8.graph.ProgramField getValueStorage(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):195:202 -> c
+    1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():66:66 -> d
+    1:1:boolean hasAuxData():44:44 -> e
+    1:15:java.lang.String toString():209:223 -> toString
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.s.a.n.p.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.t.a.o.p.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.s.a.n.p.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -23087,14 +23330,14 @@
     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.t.a.o.p.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.s.a.n.p.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:15 -> a
     2:60:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):0:58 -> a
     2:60:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     61:61:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.t.a.o.p.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.s.a.n.p.i:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -23115,8 +23358,8 @@
     1:1:int numberOfHasBitsObjects():235:235 -> j
     1:1:int numberOfOneOfObjects():239:239 -> k
     1:9:java.lang.String toString():244:252 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.t.a.o.p.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.t.a.o.p.i$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.s.a.n.p.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.s.a.n.p.i$a:
     java.util.LinkedList hasBitsObjects -> d
     boolean $assertionsDisabled -> f
     java.util.LinkedList oneOfObjects -> e
@@ -23138,7 +23381,7 @@
     49:86:void removeUnusedSharedData():129:166 -> c
     87:87:void removeUnusedSharedData():165:165 -> c
     88:89:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.t.a.o.p.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.s.a.n.p.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
@@ -23150,14 +23393,14 @@
     boolean isProtoFieldObject() -> g
     boolean isProtoObjectFromStaticGet() -> h
     boolean isProtoTypeObject() -> i
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.t.a.o.p.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.s.a.n.p.k:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:29 -> a
     4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.t.a.o.p.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.s.a.n.p.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:31 -> a
@@ -23167,7 +23410,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.t.a.o.p.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.s.a.n.p.m:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -23180,7 +23423,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.t.a.o.p.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.s.a.n.p.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>
@@ -23188,7 +23431,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.t.a.o.p.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.s.a.n.p.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
@@ -23202,13 +23445,13 @@
     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.t.a.p.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.s.a.o.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
-    1:3:void <clinit>():23:25 -> <clinit>
-    1:1:void <init>(java.lang.String,int):22:22 -> <init>
-com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.t.a.q.a:
+    1:3:void <clinit>():24:26 -> <clinit>
+    1:1:void <init>(java.lang.String,int):23:23 -> <init>
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.s.a.p.a:
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
@@ -23240,14 +23483,14 @@
     1:1:int hashCode():127:127 -> hashCode
     boolean isArrayType() -> r
     1:1:java.lang.String toString():107:107 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.t.a.q.b:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.s.a.p.b:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
     boolean isBoolean() -> s
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.t.a.q.c:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.s.a.p.c:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -23255,21 +23498,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> P
     1:1:int hashCode():35:35 -> hashCode
     boolean isBottom() -> t
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.t.a.q.d:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.s.a.p.d:
     com.android.tools.r8.ir.analysis.type.ByteTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
     boolean isByte() -> u
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.t.a.q.e:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.s.a.p.e:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
     boolean isChar() -> v
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.t.a.q.f:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.s.a.p.f:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     java.util.Set lazyInterfaces -> f
@@ -23290,7 +23533,7 @@
     8:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):106:108 -> a
     11:11:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:108 -> a
     12:29:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):150:167 -> a
-    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     30:30:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):170 -> a
     31:33:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):171:173 -> a
     34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -23307,7 +23550,7 @@
     184:239:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):0:55 -> a
     184:239:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):295 -> a
     240:267:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):295:322 -> a
-    268:268:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    268:268:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     268:268:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):324 -> a
     269:308:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):326:365 -> a
     309:309:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):289:289 -> a
@@ -23320,16 +23563,16 @@
     1:1:int hashCode():144:144 -> hashCode
     1:11:java.lang.String toString():128:138 -> toString
     boolean isClassType() -> w
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.t.a.q.f$a:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.s.a.p.f$a:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT -> a
     1:2:void <clinit>():228:229 -> <clinit>
     1:1:void <init>(java.lang.String,int):227:227 -> <init>
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.t.a.q.f$b:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.s.a.p.f$b:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):236:238 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.t.a.q.g:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.s.a.p.g:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -23351,35 +23594,35 @@
     53:53:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     53:53:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
     54:54:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.t.a.q.h:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.s.a.p.h:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> R
     1:1:int hashCode():26:26 -> hashCode
     boolean isDouble() -> z
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.t.a.q.i:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.s.a.p.i:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     boolean isFloat() -> B
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> R
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.t.a.q.j:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.s.a.p.j:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     boolean isInt() -> C
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> R
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.t.a.q.k:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.s.a.p.k:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     boolean isLong() -> D
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> R
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.t.a.q.l:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.s.a.p.l:
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
     com.android.tools.r8.ir.analysis.type.Nullability MAYBE_NULL -> c
@@ -23400,7 +23643,7 @@
     2:2:boolean isNullable():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():87:87 -> h
     1:13:java.lang.String toString():96:108 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.t.a.q.m:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.s.a.p.m:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -23412,7 +23655,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.t.a.q.n:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.s.a.p.n:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -23437,7 +23680,7 @@
     94:94:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     95:95:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):118:118 -> a
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.t.a.q.o:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.s.a.p.o:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> e
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
@@ -23460,28 +23703,28 @@
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):101:101 -> equals
     1:1:int hashCode():106:106 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.t.a.q.o$a:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.s.a.p.o$a:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     boolean isNullType() -> E
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.t.a.q.p:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.s.a.p.p:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     boolean isShort() -> J
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> R
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.t.a.q.q:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.s.a.p.q:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     boolean isSinglePrimitive() -> K
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> Q
     1:1:int hashCode():36:36 -> hashCode
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.t.a.q.r:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.s.a.p.r:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -23489,7 +23732,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> N
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> P
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.t.a.q.s:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.s.a.p.t:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -23509,10 +23752,19 @@
     23:39:void analyzeBasicBlock(com.android.tools.r8.ir.code.BasicBlock):95:111 -> a
     40:69:void updateTypeOfValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.TypeElement):125:154 -> a
     70:70:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):160:160 -> a
-    71:82:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):165:176 -> a
+    71:71:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):165:165 -> a
+    71:71:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):160 -> a
+    72:82:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):172:182 -> a
     1:1:boolean verifyValuesUpToDate(java.lang.Iterable):76:76 -> b
     1:1:void widening(java.lang.Iterable):64:64 -> c
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.t.a.q.t:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.s.a.p.s:
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
+    com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
+    1:5:void <clinit>():26:30 -> <clinit>
+    1:1:void <init>(java.lang.String,int):25:25 -> <init>
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.s.a.p.u:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -23578,7 +23830,7 @@
     1:1:boolean isDefinitelyNotNull():365:365 -> x
     1:1:boolean isDefinitelyNull():361:361 -> y
     boolean isDouble() -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.t.a.q.u:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.s.a.p.v:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -23586,7 +23838,7 @@
     int requiredRegisters() -> O
     1:1:com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement getInstance():16:16 -> Q
     1:1:int hashCode():41:41 -> hashCode
-com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.t.a.r.a:
+com.android.tools.r8.ir.analysis.value.AbstractValue -> com.android.tools.r8.s.a.q.a:
     1:1:void <init>():11:11 -> <init>
     1:10:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue):76:85 -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> b
@@ -23604,8 +23856,7 @@
     boolean isSingleFieldValue() -> o
     boolean isSingleNumberValue() -> p
     boolean isSingleStringValue() -> q
-    boolean isZero() -> r
-com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.t.a.r.b:
+com.android.tools.r8.ir.analysis.value.AbstractValueFactory -> com.android.tools.r8.s.a.q.b:
     java.util.concurrent.ConcurrentHashMap singleStringValues -> c
     java.util.concurrent.ConcurrentHashMap singleNumberValues -> b
     java.util.concurrent.ConcurrentHashMap singleConstClassValues -> a
@@ -23614,7 +23865,7 @@
     2:4:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.ObjectState):25:27 -> a
     5:5:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):31:31 -> a
     6:6:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):35:35 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.t.a.r.c:
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.s.a.q.c:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -23622,8 +23873,8 @@
     1:1:int hashCode():43:43 -> hashCode
     boolean isBottom() -> k
     boolean isNonTrivial() -> l
-    1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> s
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.t.a.r.d:
+    1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> r
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.s.a.q.d:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -23632,7 +23883,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField):24:24 -> a
     1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():19:19 -> b
     1:1:int hashCode():44:44 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.t.a.r.e:
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.s.a.q.e:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -23643,12 +23894,12 @@
     7:7:void lambda$rewrittenWithLens$0(java.util.Map,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):41:41 -> a
     1:11:boolean equals(java.lang.Object):47:57 -> equals
     1:1:int hashCode():66:66 -> hashCode
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.t.a.r.g:
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.s.a.q.g:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isEmpty() -> a
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
-com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.t.a.r.f:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.s.a.q.f:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -23658,7 +23909,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():50 -> a
     6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():50:50 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.t.a.r.h:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.s.a.q.h:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():26:26 -> <clinit>
@@ -23669,19 +23920,19 @@
     13:398:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):0:385 -> a
     13:398: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):76 -> a
     399:401: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):76:78 -> a
-    402:402:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):137:137 -> a
-    402:402:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
+    402:402:boolean com.android.tools.r8.ir.code.ConstClass.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
+    402:402:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
     402:402: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):78 -> a
     403:403: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):78:78 -> a
     404:406:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:87 -> a
-    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     407:407:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87 -> a
     408:410:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):89:91 -> a
     411:415:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:94 -> a
     416:418:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100:102 -> a
-    419:419:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    419:419:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     419:419:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):102 -> a
-    420:420:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> a
+    420:420:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> a
     420:420:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
     421:423:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103:105 -> a
     424:424:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):111:111 -> a
@@ -23689,12 +23940,12 @@
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> g
     1:1:int hashCode():56:56 -> hashCode
     boolean isSingleConstClassValue() -> m
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> s
+    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> r
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.t.a.r.i:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.s.a.q.i:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.t.a.r.j:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.s.a.q.j:
     com.android.tools.r8.graph.DexField field -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():28:28 -> <clinit>
@@ -23704,13 +23955,13 @@
     6:9:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:87 -> a
     10:15:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):83:88 -> a
     16:18:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):93:95 -> a
-    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():151:151 -> a
+    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():155:155 -> a
     19:19:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98 -> a
     20:20:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:101 -> a
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     21:21:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
     22:22:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103:103 -> a
-    23:23:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> a
+    23:23:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> a
     23:23:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):106 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):28:28 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):43:49 -> b
@@ -23719,9 +23970,9 @@
     13:13:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):119:119 -> c
     com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> h
     boolean isSingleFieldValue() -> o
-    1:1:com.android.tools.r8.graph.DexField getField():37:37 -> s
-    com.android.tools.r8.ir.analysis.value.ObjectState getState() -> t
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.t.a.r.k:
+    1:1:com.android.tools.r8.graph.DexField getField():37:37 -> r
+    com.android.tools.r8.ir.analysis.value.ObjectState getState() -> s
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.s.a.q.k:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -23735,26 +23986,25 @@
     1:1:int hashCode():60:60 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> i
     boolean isSingleNumberValue() -> p
-    1:1:boolean isZero():31:31 -> r
-    1:2:boolean getBooleanValue():45:46 -> s
+    1:2:boolean getBooleanValue():45:46 -> r
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.t.a.r.l:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.s.a.q.l:
     com.android.tools.r8.ir.analysis.value.ObjectState state -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():10:10 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.ObjectState):16:18 -> <init>
     1:5:boolean equals(java.lang.Object):33:37 -> equals
     1:1:int hashCode():42:42 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> t
+    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> s
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.t.a.r.m:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.s.a.q.m:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
     1:5:boolean equals(java.lang.Object):28:32 -> equals
     1:1:int hashCode():37:37 -> hashCode
-    1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> t
-    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> t
+    1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> s
+    1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> s
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.t.a.r.n:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.s.a.q.n:
     com.android.tools.r8.graph.DexString string -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():25:25 -> <clinit>
@@ -23768,10 +24018,10 @@
     1:1:int hashCode():55:55 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleStringValue asSingleStringValue() -> j
     boolean isSingleStringValue() -> q
-    1:1:com.android.tools.r8.graph.DexString getDexString():45:45 -> s
-    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> t
+    1:1:com.android.tools.r8.graph.DexString getDexString():45:45 -> r
+    com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> s
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.t.a.r.o:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.s.a.q.o:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
@@ -23779,7 +24029,7 @@
     boolean isSingleValue() -> c
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> f
     boolean isNonTrivial() -> l
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.t.a.r.p:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.s.a.q.p:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -23787,19 +24037,19 @@
     boolean isUnknown() -> d
     1:1:int hashCode():43:43 -> hashCode
     boolean isNonTrivial() -> l
-    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> s
-com.android.tools.r8.ir.code.Add -> com.android.tools.r8.t.b.a:
+    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> r
+com.android.tools.r8.ir.code.Add -> com.android.tools.r8.s.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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> T2
-    boolean isAdd() -> W0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> R2
+    boolean isAdd() -> U0
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):57:57 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):57:57 -> a
     1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):52:52 -> b
     2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):77:77 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
@@ -23811,63 +24061,63 @@
     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() -> i
-com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.t.b.b:
+com.android.tools.r8.ir.code.AliasedValueConfiguration -> com.android.tools.r8.s.b.b:
     com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction) -> a
     boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction) -> b
-com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.t.b.c:
+com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.s.b.c:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    1:1:int maxInValueRegister():56:56 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:int maxInValueRegister():56:56 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:41 -> a
-    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
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
+    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:41 -> a
+    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
+    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.t.b.d:
+com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.s.b.d:
     1:1:void <init>():19:19 -> <init>
-    1:1:int maxInValueRegister():54:54 -> I2
-    1:1:int maxOutValueRegister():59:59 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:int maxInValueRegister():54:54 -> G2
+    1:1:int maxOutValueRegister():59:59 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
-    2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):44:44 -> 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):65:65 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
+    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):44:44 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):65:65 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
-    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.t.b.e:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.s.b.e:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    1:2:int maxInValueRegister():54:55 -> I2
-    1:1:int maxOutValueRegister():60:60 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:2:int maxInValueRegister():54:55 -> G2
+    1:1:int maxOutValueRegister():60:60 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAlwaysMaterializingUser():0:69 -> a
-    1:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
-    71:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
-    72:72:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):44:44 -> a
-    73:73:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
+    1:70:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):66 -> a
+    71:71:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
+    72:72:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
+    73:73:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):44:44 -> a
+    74:74:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    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.t.b.f:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.And -> com.android.tools.r8.s.b.f:
     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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> T2
-    boolean isAnd() -> Y0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> R2
+    boolean isAnd() -> W0
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> a
-    2:2:boolean outTypeKnownToBeBoolean(java.util.Set):99:99 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):49:49 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):99:99 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):59:59 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):74:74 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79:79 -> b
@@ -23875,39 +24125,41 @@
     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() -> j
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.t.b.g:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.s.b.g:
     boolean knownToBeBoolean -> i
     boolean $assertionsDisabled -> j
     int index -> h
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.Value,int,boolean):28:30 -> <init>
-    1:1:int maxInValueRegister():73:73 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:int getIndex():34:34 -> O2
-    2:7:boolean verifyIndex():40:45 -> O2
-    2:7:int getIndex():34 -> O2
-    8:9:int getIndex():34:35 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean isArgument() -> Z0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.Value,int,boolean):29:31 -> <init>
+    1:1:int maxInValueRegister():74:74 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:int getIndex():35:35 -> M2
+    2:7:boolean verifyIndex():41:46 -> M2
+    2:7:int getIndex():35 -> M2
+    8:9:int getIndex():35:36 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean isArgument() -> X0
+    1:1:void com.android.tools.r8.ir.conversion.CfBuilder.addArgument(com.android.tools.r8.ir.code.Argument):0:0 -> a
+    1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):121 -> a
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArgument():0:73 -> a
-    1:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    2:75:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArgument():0:73 -> a
+    2:75:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):106 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    75:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:84 -> a
-    76:76:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):115:115 -> a
-    77:77:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):125:125 -> a
-    78:78:boolean outTypeKnownToBeBoolean(java.util.Set):135:135 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):89:89 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    76:76:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):61:61 -> a
+    77:77:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:85 -> a
+    78:78:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):116:116 -> a
+    79:79:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):126:126 -> a
+    80:80:boolean outTypeKnownToBeBoolean(java.util.Set):136:136 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Argument asArgument() -> k
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.t.b.h:
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.s.b.h:
     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>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> T2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> R2
+    boolean isArithmeticBinop() -> Y0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
     26:26:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
@@ -23920,7 +24172,6 @@
     73:88:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):105:120 -> a
     89:115:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):135:161 -> a
     116:116:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):168:168 -> a
-    boolean isArithmeticBinop() -> a1
     com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int) -> b
     com.android.tools.r8.code.Instruction CreateFloat(int,int,int) -> b
     com.android.tools.r8.code.Instruction CreateFloat2Addr(int,int) -> c
@@ -23932,269 +24183,233 @@
     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() -> l
-com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.t.b.i:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.s.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> O2
-    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> P2
+    1:1:com.android.tools.r8.ir.code.Value array():20:20 -> M2
+    1:1:com.android.tools.r8.ir.code.Value index():24:24 -> N2
+    boolean isArrayAccess() -> Z0
     com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> a
-    boolean isArrayAccess() -> b1
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> m
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.t.b.j:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.s.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):38:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():251:251 -> I0
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    boolean throwsOnNullInput() -> N2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):39:40 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():252:252 -> G0
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    boolean throwsOnNullInput() -> L2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayGet():0:77 -> a
-    1:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):155 -> a
-    79:79:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    79:79:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70 -> a
-    80:118:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:108 -> a
-    119:119:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:106 -> a
-    120:120:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):102:102 -> a
-    121:121:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
-    122:127:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):89:94 -> a
-    128:130:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):93:95 -> a
-    131:131:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-    132:134:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:83 -> a
-    135:168:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:110 -> a
-    169:171:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):63:65 -> a
-    172:178:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):166:172 -> a
-    179:180:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:178 -> a
-    181:181:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):183:183 -> a
-    182:182:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):189:189 -> a
-    183:183:com.android.tools.r8.ir.code.MemberType getMemberType():58:58 -> a
-    183:183:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):190 -> a
-    184:220:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):190:226 -> a
-    221:223:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):222:222 -> a
-    224:224:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    224:224:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):224 -> a
-    225:225:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):224:224 -> a
-    226:228:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):218:218 -> a
-    229:229:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    229:229:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):220 -> a
-    230:230:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):220:220 -> a
-    231:249:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):198:216 -> a
-    250:251:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):212:213 -> a
-    252:253:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):209:210 -> a
-    254:255:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):206:207 -> a
-    256:256:com.android.tools.r8.ir.code.MemberType getMemberType():58:58 -> a
-    256:256:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):226 -> a
-    257:257:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):226:226 -> a
-    258:262:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):231:235 -> a
-    263:263:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    263:263:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):235 -> a
-    264:264:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    264:264:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    264:264:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):235 -> a
-    265:265:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):235:235 -> a
-    266:266:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):241:241 -> a
-    267:268:boolean outTypeKnownToBeBoolean(java.util.Set):256:257 -> a
-    269:269:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):262:262 -> a
-    270:270:com.android.tools.r8.ir.code.Value dest():53:53 -> a
-    270:270:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):262 -> a
-    271:271:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):262:262 -> a
-    272:272:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):123:123 -> b
-    2:2:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):262:262 -> b
-    boolean isArrayGet() -> c1
-    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():58:58 -> e
+    1:78:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):156 -> a
+    79:79:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
+    80:80:com.android.tools.r8.ir.code.Value dest():54:54 -> a
+    80:80:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
+    81:119:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:109 -> a
+    120:120:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):107:107 -> a
+    121:121:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):103:103 -> a
+    122:122:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
+    123:128:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:95 -> a
+    129:131:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):94:96 -> a
+    132:132:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:87 -> a
+    133:135:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:84 -> a
+    136:169:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:111 -> a
+    170:172:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):64:66 -> a
+    173:179:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):167:173 -> a
+    180:181:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:179 -> a
+    182:182:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):184:184 -> a
+    183:183:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):190:190 -> a
+    184:184:com.android.tools.r8.ir.code.MemberType getMemberType():59:59 -> a
+    184:184:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):191 -> a
+    185:221:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):191:227 -> a
+    222:224:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):223:223 -> a
+    225:225:com.android.tools.r8.ir.code.Value dest():54:54 -> a
+    225:225:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):225 -> a
+    226:226:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):225:225 -> a
+    227:229:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):219:219 -> a
+    230:230:com.android.tools.r8.ir.code.Value dest():54:54 -> a
+    230:230:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):221 -> a
+    231:231:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):221:221 -> a
+    232:250:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):199:217 -> a
+    251:252:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):213:214 -> a
+    253:254:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):210:211 -> a
+    255:256:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):207:208 -> a
+    257:257:com.android.tools.r8.ir.code.MemberType getMemberType():59:59 -> a
+    257:257:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):227 -> a
+    258:258:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):227:227 -> a
+    259:263:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):232:236 -> a
+    264:264:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    264:264:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):236 -> a
+    265:265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    265:265:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    265:265:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):236 -> a
+    266:266:com.android.tools.r8.ir.analysis.type.TypeElement checkConstraint(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):236:236 -> a
+    267:267:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):242:242 -> a
+    268:269:boolean outTypeKnownToBeBoolean(java.util.Set):257:258 -> a
+    270:270:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):263:263 -> a
+    271:271:com.android.tools.r8.ir.code.Value dest():54:54 -> a
+    271:271:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):263 -> a
+    272:272:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):263:263 -> a
+    273:273:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> a
+    boolean isArrayGet() -> a1
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):124:124 -> b
+    2:2:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):263:263 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:com.android.tools.r8.ir.code.MemberType getMemberType():59:59 -> e
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> n
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.t.b.k:
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> I0
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    boolean throwsOnNullInput() -> N2
-    1:1:com.android.tools.r8.ir.code.Value array():41:41 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.s.b.k:
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():149:149 -> G0
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    boolean throwsOnNullInput() -> L2
+    1:1:com.android.tools.r8.ir.code.Value array():40:40 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
     1:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():0:81 -> a
-    1:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):118 -> a
-    83:83:com.android.tools.r8.ir.code.Value dest():37:37 -> a
-    83:83:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
-    84:86:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:58 -> a
-    87:87:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):88:88 -> a
-    88:88:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93:93 -> a
-    89:89:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):88:88 -> a
-    89:89:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    89:89:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93 -> a
-    90:97:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):98:105 -> a
-    98:99:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:124 -> a
-    100:100:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> a
-    101:101:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):134:134 -> a
-    102:102:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:144 -> a
-    1:5:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):78:82 -> b
-    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112:112 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isArrayLength() -> d1
+    1:82:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):113 -> a
+    83:83:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
+    84:84:com.android.tools.r8.ir.code.Value dest():36:36 -> a
+    84:84:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
+    85:87:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:57 -> a
+    88:88:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> a
+    88:88:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):83 -> a
+    89:89:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88:88 -> a
+    90:90:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> a
+    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):83 -> a
+    90:90:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    90:90:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
+    91:98:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):93:100 -> a
+    99:100:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:119 -> a
+    101:101:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):124:124 -> a
+    102:102:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):129:129 -> a
+    103:103:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):139:139 -> a
+    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:77 -> b
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):107:107 -> b
+    boolean isArrayLength() -> b1
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> o
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.t.b.l:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.s.b.l:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:41 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():254:254 -> I0
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():113:113 -> J2
-    int opcode() -> K2
-    boolean throwsOnNullInput() -> N2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> Q2
-    1:5:boolean instructionInstanceCanThrow():124:128 -> T0
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():254:254 -> G0
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():113:113 -> H2
+    int opcode() -> I2
+    boolean throwsOnNullInput() -> L2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.Value value():55:55 -> O2
+    1:5:boolean instructionInstanceCanThrow():124:128 -> R0
+    boolean instructionTypeCanThrow() -> T0
     boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     1:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():0:85 -> a
-    1:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):224 -> a
-    87:123:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:101 -> a
-    124:124:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
-    125:125:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
-    126:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
-    127:132:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:87 -> a
-    133:135:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:88 -> a
-    136:136:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
-    137:137:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    138:169:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:103 -> a
-    170:216:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):139:185 -> a
-    217:217:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195:195 -> a
-    218:218:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    218:218:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> a
-    219:219:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):229:229 -> a
-    220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239:239 -> a
-    221:221:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):244:244 -> a
-    222:222:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):259:259 -> a
-    223:223:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):269:269 -> a
+    1:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):224 -> a
+    87:87:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51:51 -> a
+    88:124:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:101 -> a
+    125:125:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):99:99 -> a
+    126:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    127:127:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
+    128:133:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:87 -> a
+    134:136:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:88 -> a
+    137:137:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    138:138:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    139:170:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:103 -> a
+    171:217:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):139:185 -> a
+    218:218:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195:195 -> a
+    219:219:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    219:219:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> a
+    220:220:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):229:229 -> a
+    221:221:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):239:239 -> a
+    222:222:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):244:244 -> a
+    223:223:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):259:259 -> a
+    224:224:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):269:269 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):208:208 -> b
     2:2:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):259:259 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean isArrayPut() -> c1
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:1:com.android.tools.r8.ir.code.MemberType getMemberType():60:60 -> e
-    boolean isArrayPut() -> e1
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> p
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.t.b.m:
-    com.android.tools.r8.ir.code.Instruction origin -> i
-    boolean $assertionsDisabled -> j
-    com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.ir.code.Assume$Assumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):31:36 -> <init>
-    1:1:boolean isAssumeNone():124:124 -> H0
-    1:1:java.lang.String getInstructionName():100 -> H0
-    2:2:boolean isAssumeDynamicType():137:137 -> H0
-    2:2:java.lang.String getInstructionName():103 -> H0
-    3:6:java.lang.String getInstructionName():106:109 -> H0
-    1:1:int maxInValueRegister():217:217 -> I2
-    1:1:int maxOutValueRegister():222:222 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.Instruction origin():90:90 -> P2
-    1:1:com.android.tools.r8.ir.code.Value src():86:86 -> Q2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:297:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():0:296 -> a
-    1:297:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):242 -> a
-    298:298:com.android.tools.r8.ir.code.Assume createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):46:46 -> a
-    299:299:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):56:56 -> a
-    300:300:boolean outTypeKnownToBeBoolean(java.util.Set):95:95 -> a
-    301:322:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):167:188 -> a
-    323:329:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):186:192 -> a
-    330:330:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):207:207 -> a
-    331:331:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):212:212 -> a
-    332:339:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):247:254 -> a
-    340:340:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):248:248 -> a
-    341:341:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):259:259 -> a
-    342:342:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):269:269 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):232:236 -> b
-    6:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):279:282 -> b
-    10:10:boolean isAssumeNone():124:124 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):283 -> b
-    11:11:boolean isAssumeDynamicType():137:137 -> b
-    11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):283 -> b
-    12:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):288:291 -> b
-    16:18:boolean verifyTypes(com.android.tools.r8.graph.AppView):284:286 -> b
-    1:1:boolean isAssumeDynamicType():137:137 -> c
-    1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):70 -> c
-    2:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):71:71 -> c
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isAssume() -> f1
-    1:1:boolean isAssumeDynamicType():137:137 -> g1
-    1:1:boolean isAssumeNonNull():150:150 -> h1
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.s.b.m:
+    com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> h
+    boolean $assertionsDisabled -> k
+    com.android.tools.r8.ir.code.Instruction origin -> j
+    com.android.tools.r8.ir.code.Assume$NonNullAssumption nonNullAssumption -> i
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption,com.android.tools.r8.ir.code.Assume$NonNullAssumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):39:42 -> <init>
+    5:15:void <init>(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption,com.android.tools.r8.ir.code.Assume$NonNullAssumption,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):41:51 -> <init>
+    1:7:java.lang.String getInstructionName():115:121 -> F0
+    1:1:int maxInValueRegister():192:192 -> G2
+    1:1:int maxOutValueRegister():197:197 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption getDynamicTypeAssumption():93:93 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.Instruction origin():105:105 -> N2
+    1:1:com.android.tools.r8.ir.code.Value src():101:101 -> O2
+    1:285:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():0:284 -> a
+    1:285:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):218 -> a
+    286:286:com.android.tools.r8.ir.code.Assume createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):56:56 -> a
+    287:287:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):66:66 -> a
+    288:288:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):89:89 -> a
+    289:289:boolean outTypeKnownToBeBoolean(java.util.Set):110:110 -> a
+    290:307:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):146:163 -> a
+    308:314:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):161:167 -> a
+    315:315:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):182:182 -> a
+    316:316:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):187:187 -> a
+    317:324:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):223:230 -> a
+    325:325:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):235:235 -> a
+    326:326:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):245:245 -> a
+    1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):207:212 -> b
+    7:19:boolean verifyTypes(com.android.tools.r8.graph.AppView):255:267 -> b
+    1:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):81:82 -> c
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isAssume() -> d1
+    1:1:boolean isAssumeDynamicType():136:136 -> e1
+    1:1:boolean isAssumeNonNull():141:141 -> f1
+    boolean isOutConstant() -> o2
     com.android.tools.r8.ir.code.Assume asAssume() -> q
-    boolean isOutConstant() -> q2
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> r
-    2:2:boolean isAssumeDynamicType():137:137 -> r
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142 -> r
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> r
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> s
-    1:1:java.lang.String toString():304:304 -> toString
-    2:2:boolean isAssumeNone():124:124 -> toString
-    2:2:java.lang.String toString():305 -> toString
-    3:3:java.lang.String toString():305:305 -> toString
-    4:4:boolean isAssumeDynamicType():137:137 -> toString
-    4:4:java.lang.String toString():308 -> toString
-    5:5:java.lang.String toString():309:309 -> toString
-    6:6:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> toString
-    6:6:java.lang.String toString():309 -> toString
-    7:16:java.lang.String toString():309:318 -> toString
-    17:17:java.lang.String toString():306:306 -> toString
-com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.t.b.m$a:
-com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.t.b.m$b:
-    1:1:void <init>():321:321 -> <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.t.b.m$c:
+    1:14:java.lang.String toString():280:293 -> toString
+com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.s.b.m$a:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.s.b.m$b:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():361:361 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Assume$1):361:361 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):367:369 -> <init>
-    boolean isAssumeDynamicType() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):361:361 -> a
-    2:2:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):387:387 -> a
-    boolean isAssumeNonNull() -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):361:361 -> b
-    boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():377:377 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():373:373 -> e
-    1:5:boolean equals(java.lang.Object):396:400 -> equals
-    1:1:int hashCode():406:406 -> hashCode
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.t.b.m$d:
+    1:1:void <clinit>():296:296 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Assume$1):296:296 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):302:304 -> <init>
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):296:296 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():312:312 -> a
+    3:3:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):316:316 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):296:296 -> b
+    2:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():308:308 -> b
+    1:5:boolean equals(java.lang.Object):325:329 -> equals
+    1:1:int hashCode():335:335 -> hashCode
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.s.b.m$c:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():410:412 -> <clinit>
-    1:1:void <init>():414:414 -> <init>
-    boolean isAssumeDynamicType() -> a
-    1:1:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):427:427 -> a
-    boolean isAssumeNonNull() -> b
-    boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():417:417 -> d
-com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.t.b.n:
+    1:3:void <clinit>():339:341 -> <clinit>
+    1:1:void <init>():343:343 -> <init>
+    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():346:346 -> a
+    2:2:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):350:350 -> a
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.s.b.n:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration getInstance():17:17 -> a
     2:2:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):27:27 -> a
-    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     3:3:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28 -> a
     4:4:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> a
     4:4:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28 -> a
     5:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):28:28 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.t.b.o:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.s.b.o:
     int color -> n
     int estimatedPredecessorsCount -> l
     boolean $assertionsDisabled -> p
@@ -24294,60 +24509,59 @@
     151:151:boolean blocksClean(java.util.List):788:788 -> a
     152:161:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):868:877 -> a
     162:162:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):874:874 -> a
-    163:172:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):903:912 -> a
-    173:182:void linkCatchSuccessors(java.util.List,java.util.List):951:960 -> a
-    183:214:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):964:995 -> a
-    215:225:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):1006:1016 -> a
-    226:227:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1066:1067 -> a
-    226:227:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1073 -> a
-    228:246:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104:1122 -> a
-    247:251:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1129:1133 -> a
-    252:255:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1132:1135 -> a
-    256:260:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1184:1188 -> a
-    261:268:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1201:1208 -> a
-    269:272:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1318:1321 -> a
-    273:305:void print(com.android.tools.r8.utils.CfgPrinter):1326:1358 -> a
-    306:307:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1362:1363 -> a
-    308:309:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1421:1422 -> a
-    310:314:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1435:1439 -> a
-    315:321:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1470:1476 -> a
-    322:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1492:1501 -> a
-    332:332:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
-    332:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1502 -> a
+    163:167:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):903:907 -> a
+    168:168:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
+    168:168:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):908 -> a
+    169:173:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):908:912 -> a
+    174:183:void linkCatchSuccessors(java.util.List,java.util.List):951:960 -> a
+    184:215:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):964:995 -> a
+    216:226:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):1006:1016 -> a
+    227:228:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1066:1067 -> a
+    227:228:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1073 -> a
+    229:247:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104:1122 -> a
+    248:252:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1129:1133 -> a
+    253:256:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1132:1135 -> a
+    257:261:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1184:1188 -> a
+    262:269:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1201:1208 -> a
+    270:273:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1318:1321 -> a
+    274:306:void print(com.android.tools.r8.utils.CfgPrinter):1326:1358 -> a
+    307:308:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1362:1363 -> a
+    309:310:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1421:1422 -> a
+    311:315:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1435:1439 -> a
+    316:322:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1470:1476 -> a
+    323:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1492:1501 -> a
     333:333:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
-    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503 -> a
-    334:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1504:1505 -> a
-    336:337:boolean canThrow():1617:1618 -> a
-    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1666:1666 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1670:1670 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1666 -> a
+    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1502 -> a
+    334:334:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
+    334:334:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503 -> a
+    335:336:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1504:1505 -> a
+    337:338:boolean canThrow():1617:1618 -> a
+    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1666:1666 -> a
     340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1670:1670 -> a
-    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1674:1674 -> a
-    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1685:1685 -> a
-    343:354:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1703:1714 -> a
-    355:360:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1735:1740 -> a
-    355:360:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1718 -> a
-    361:365:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1722:1726 -> a
-    366:382:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1751:1767 -> a
-    383:2199:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):0:1816 -> a
-    383:2199:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2200:2200:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
-    2200:2200:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1817 -> a
-    2200:2200:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2201:2204:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1818:1821 -> a
-    2201:2204:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2205:2205:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
-    2205:2205:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1822 -> a
-    2205:2205:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2206:2211:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1823:1828 -> a
-    2206:2211:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2212:2212:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806:1806 -> a
-    2212:2212:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2213:2213:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    2213:2213:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806 -> a
+    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1666 -> a
+    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1670:1670 -> a
+    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1674:1674 -> a
+    343:343:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1685:1685 -> a
+    344:355:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1703:1714 -> a
+    356:361:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1735:1740 -> a
+    356:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1718 -> a
+    362:366:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1722:1726 -> a
+    367:383:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1751:1767 -> a
+    384:2200:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):0:1816 -> a
+    384:2200:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
+    2201:2201:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
+    2201:2201:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1817 -> a
+    2201:2201:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
+    2202:2205:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1818:1821 -> a
+    2202:2205:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
+    2206:2206:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):758:758 -> a
+    2206:2206:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1822 -> a
+    2206:2206:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
+    2207:2212:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1823:1828 -> a
+    2207:2212:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
+    2213:2213:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806:1806 -> a
     2213:2213:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
-    2214:2214:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    2214:2214:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2214:2214:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     2214:2214:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806 -> a
     2214:2214:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1767 -> a
     2215:2249:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806:1840 -> a
@@ -24370,10 +24584,10 @@
     53:88:java.lang.String toDetailedString():1279:1314 -> a0
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):283:283 -> b
     2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):374:404 -> b
-    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> b
+    33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> b
     33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):406 -> b
     34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):406:406 -> b
-    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> b
+    35:35:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> b
     35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):407 -> b
     36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):407:410 -> b
     40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):471:475 -> b
@@ -24463,7 +24677,7 @@
     1:1:java.util.List getPhis():579:579 -> x
     1:1:java.util.List getPredecessors():273:273 -> y
     1:1:java.util.List getSuccessors():210:210 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.t.b.o$a:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.s.b.o$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
@@ -24475,14 +24689,14 @@
     1:5:java.lang.Object next():631 -> next
     6:6:com.android.tools.r8.ir.code.Instruction next():655:655 -> next
     6:6:java.lang.Object next():631 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.t.b.o$b:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.t.b.o$c:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.s.b.o$b:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.s.b.o$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.t.b.o$d:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.s.b.o$d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1963:1963 -> <clinit>
     1:1:void <init>():1963:1963 -> <init>
@@ -24493,15 +24707,15 @@
     1:1:int doHash(java.lang.Object):1963:1963 -> doHash
     2:3:int doHash(com.android.tools.r8.ir.code.Phi):1978:1979 -> doHash
     2:3:int doHash(java.lang.Object):1963 -> doHash
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.t.b.o$e:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.s.b.o$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():401:401 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> 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.t.b.p:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.s.b.p:
     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>
@@ -24512,7 +24726,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.t.b.q:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.s.b.q:
     com.android.tools.r8.ir.code.IRMetadata metadata -> e
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.Instruction current -> c
@@ -24536,12 +24750,12 @@
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     9:9:void setInsertionPosition(com.android.tools.r8.ir.code.Position):91:91 -> a
     10:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):186:186 -> a
-    11:11:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    11:11:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):189 -> a
     12:28:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):189:205 -> a
     29:29:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):187:187 -> a
     30:39:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):250:259 -> a
-    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    40:40:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     40:40:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):259 -> a
     41:44:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):259:262 -> a
     45:45:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
@@ -24549,7 +24763,7 @@
     46:47:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):268:269 -> a
     48:48:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):251:251 -> a
     49:72:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):280:303 -> a
-    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    73:73:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     73:73:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):303 -> a
     74:77:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):303:306 -> a
     78:78:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
@@ -24576,19 +24790,19 @@
     188:190:boolean canThrow(com.android.tools.r8.ir.code.IRCode):394:396 -> a
     188:190: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):508 -> a
     191:207: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):512:528 -> a
-    208:208:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    208:208:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     208:208: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):529 -> a
     209:216: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):529:536 -> a
-    217:217:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    217:217:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     217:217: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):539 -> a
     218:221: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):539:542 -> a
     222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
     222:222: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):543 -> a
     223:255: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):543:575 -> a
-    256:256:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    256:256:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     256:256: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):579 -> a
     257:261: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):579:583 -> a
-    262:262:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
+    262:262:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
     262:262: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):584 -> a
     263:270: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):584:591 -> a
     271:271:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
@@ -24600,7 +24814,7 @@
     294:294:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
     294:294: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):612 -> a
     295:328: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):611:644 -> a
-    329:329:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1032:1032 -> a
+    329:329:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1032:1032 -> a
     329:329: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):644 -> a
     330:343: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):647:660 -> a
     344:360:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):461:477 -> a
@@ -24623,7 +24837,7 @@
     1:1:void add(java.lang.Object):30:30 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):104:110 -> b
     8:16:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):230:238 -> b
-    17:17:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> b
+    17:17:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> b
     17:17:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):238 -> b
     18:21:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):238:241 -> b
     22:22:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
@@ -24644,68 +24858,68 @@
     2:2:com.android.tools.r8.ir.code.Instruction previous():80:80 -> previous
     1:1:int previousIndex():86:86 -> previousIndex
     1:6:void remove():140:145 -> remove
-    7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> remove
+    7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> remove
     7:7:void remove():145 -> remove
     8:9:void remove():145:146 -> remove
-    10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> remove
+    10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> remove
     10:10:void remove():146 -> remove
     11:25:void remove():146:160 -> remove
     26:26:void remove():141:141 -> remove
     1:1:void set(java.lang.Object):30:30 -> set
     2:5:void set(com.android.tools.r8.ir.code.Instruction):123:126 -> set
     2:5:void set(java.lang.Object):30 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.t.b.r:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.s.b.r:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.BasicBlock current -> c
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode):15:17 -> <init>
-    4:6:void <init>(com.android.tools.r8.ir.code.IRCode,int):20:22 -> <init>
-    1:1:void add(java.lang.Object):9:9 -> add
-    2:2:void add(com.android.tools.r8.ir.code.BasicBlock):59:59 -> add
-    2:2:void add(java.lang.Object):9 -> add
-    1:1:boolean hasNext():27:27 -> hasNext
-    1:1:boolean hasPrevious():43:43 -> hasPrevious
-    1:1:com.android.tools.r8.ir.code.BasicBlock next():32:32 -> next
-    1:1:java.lang.Object next():9 -> next
-    1:1:int nextIndex():38:38 -> nextIndex
-    1:1:com.android.tools.r8.ir.code.BasicBlock previous():48:48 -> previous
-    1:1:java.lang.Object previous():9 -> previous
-    1:1:int previousIndex():54:54 -> previousIndex
-    1:12:void remove():77:88 -> remove
-    13:13:void remove():78:78 -> remove
-    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.t.b.s:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode):16:18 -> <init>
+    4:6:void <init>(com.android.tools.r8.ir.code.IRCode,int):21:23 -> <init>
+    1:1:void add(java.lang.Object):10:10 -> add
+    2:2:void add(com.android.tools.r8.ir.code.BasicBlock):68:68 -> add
+    2:2:void add(java.lang.Object):10 -> add
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:1:boolean hasPrevious():52:52 -> hasPrevious
+    1:1:com.android.tools.r8.ir.code.BasicBlock next():41:41 -> k
+    1:1:java.lang.Object next():10:10 -> next
+    1:1:int nextIndex():47:47 -> nextIndex
+    1:1:com.android.tools.r8.ir.code.BasicBlock previous():57:57 -> previous
+    1:1:java.lang.Object previous():10 -> previous
+    1:1:int previousIndex():63:63 -> previousIndex
+    1:12:void remove():86:97 -> remove
+    13:13:void remove():87:87 -> remove
+    1:1:void set(java.lang.Object):10:10 -> set
+    2:2:void set(com.android.tools.r8.ir.code.BasicBlock):73:73 -> set
+    2:2:void set(java.lang.Object):10 -> set
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.s.b.s:
     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 -> I2
-    1:1:int maxOutValueRegister():95:95 -> J2
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> Q2
-    1:2:int maxInOutValueRegisterSize():82:83 -> R2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> S2
+    1:1:int maxInValueRegister():90:90 -> G2
+    1:1:int maxOutValueRegister():95:95 -> H2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> O2
+    1:2:int maxInOutValueRegisterSize():82:83 -> P2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> Q2
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
     1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
-    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127 -> a
+    1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127 -> a
     91:98:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1391:1391 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1425:1425 -> a
     99:99:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     100:100:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     101:102:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):132:133 -> a
     103:103:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:3:boolean fitsInLit16Instruction(com.android.tools.r8.ir.code.Value):68:70 -> g
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
+    boolean isBinop() -> g1
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
-    boolean isBinop() -> i1
-    com.android.tools.r8.ir.code.Binop asBinop() -> t
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.t.b.t:
+    com.android.tools.r8.ir.code.Binop asBinop() -> r
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.s.b.t:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -24725,7 +24939,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.t.b.u:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.s.b.u:
     java.util.List targets -> b
     java.util.List guards -> a
     java.util.Set uniqueTargets -> c
@@ -24755,86 +24969,89 @@
     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.t.b.u$a:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.s.b.u$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.t.b.u$b:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.s.b.u$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.t.b.v:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.s.b.v:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):36:37 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexType getType():51:51 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexType getType():51:51 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
     2:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:76 -> a
-    16:16:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):100:100 -> a
-    17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):158:158 -> a
+    16:16:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):100:100 -> a
+    17:17:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
     18:18:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):163:163 -> a
     19:20:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):207:208 -> a
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):219:219 -> a
     22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):224:224 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):84:84 -> b
-    2:9:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:112 -> b
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    10:10:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113 -> b
-    11:16:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):115:120 -> b
-    17:33:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):116:132 -> b
-    34:34:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:106 -> b
-    35:41:boolean verifyTypes(com.android.tools.r8.graph.AppView):168:174 -> b
-    42:42:com.android.tools.r8.graph.DexType getType():51:51 -> b
-    42:42:boolean verifyTypes(com.android.tools.r8.graph.AppView):175 -> b
-    43:63:boolean verifyTypes(com.android.tools.r8.graph.AppView):175:195 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> f
+    2:9:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):105:112 -> b
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    10:10:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):113 -> b
+    11:11:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):115:115 -> b
+    12:12:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):20:20 -> b
+    12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119 -> b
+    13:13:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> b
+    13:13:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119 -> b
+    14:22:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:127 -> b
+    23:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):168:174 -> b
+    30:30:com.android.tools.r8.graph.DexType getType():51:51 -> b
+    30:30:boolean verifyTypes(com.android.tools.r8.graph.AppView):175 -> b
+    31:51:boolean verifyTypes(com.android.tools.r8.graph.AppView):175:195 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> f
     1:1:com.android.tools.r8.ir.code.Value object():55 -> f
     2:2:com.android.tools.r8.ir.code.Value object():55:55 -> f
-    boolean isCheckCast() -> j1
+    boolean isCheckCast() -> h1
+    com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():152:152 -> toString
-    com.android.tools.r8.ir.code.CheckCast asCheckCast() -> u
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.t.b.w:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.s.b.w:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    29:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:81 -> a
-    31:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:76 -> a
-    37:61:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
-    62:70:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):90:98 -> a
-    71:85:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):163:177 -> a
-    86:97:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):175:186 -> a
-    98:110:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):184:196 -> a
-    111:117:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):195:201 -> a
-    118:124:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):200:206 -> a
-    125:128:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):205:208 -> a
-    129:135:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):213:219 -> a
-    136:136:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):234:234 -> a
-    137:137:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
+    30:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:81 -> a
+    32:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:76 -> a
+    38:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
+    63:71:java.lang.String biasToString(com.android.tools.r8.ir.code.Cmp$Bias):90:98 -> a
+    72:86:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):163:177 -> a
+    87:98:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):175:186 -> a
+    99:111:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):184:196 -> a
+    112:118:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):195:201 -> a
+    119:125:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):200:206 -> a
+    126:129:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):205:208 -> a
+    130:136:com.android.tools.r8.ir.analysis.constant.LatticeElement buildLatticeResult(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LongInterval,com.android.tools.r8.utils.LongInterval):213:219 -> a
+    137:137:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):234:234 -> a
+    138:138:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):239:239 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):136:136 -> b
-    boolean isCmp() -> k1
+    boolean isCmp() -> i1
+    com.android.tools.r8.ir.code.Cmp asCmp() -> t
     1:17:java.lang.String toString():104:120 -> toString
     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 asCmp() -> v
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.t.b.w$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.s.b.w$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
@@ -24843,19 +25060,19 @@
     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.t.b.x:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.s.b.x:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):31:32 -> <init>
-    1:1:int maxInValueRegister():72:72 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> O2
-    boolean instructionInstanceCanThrow() -> T0
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    boolean instructionTypeCanThrow() -> V0
+    1:1:int maxInValueRegister():72:72 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> M2
+    boolean instructionInstanceCanThrow() -> R0
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    boolean instructionTypeCanThrow() -> T0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
     2:3:com.android.tools.r8.ir.code.ConstClass copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstClass):52:53 -> a
     4:4:com.android.tools.r8.graph.DexType getValue():61:61 -> a
@@ -24864,307 +25081,312 @@
     6:6:com.android.tools.r8.ir.code.Value dest():57:57 -> a
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66 -> a
     7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:67 -> a
-    9:9:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):137:137 -> a
-    9:9:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    9:9:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):193 -> a
-    10:12:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:196 -> a
-    13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):137:137 -> a
-    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
-    15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):137:137 -> a
-    15:15:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142 -> a
-    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):168:168 -> a
-    17:17:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):173:173 -> a
+    9:9:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
+    9:9:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    9:9:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):189 -> a
+    10:12:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):190:192 -> a
+    13:13:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
+    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:132 -> a
+    15:15:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137 -> a
+    16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163:163 -> a
+    17:17:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):168:168 -> a
     18:403:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):0:385 -> a
-    18:403:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):173 -> a
-    404:404:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):178:178 -> a
-    405:405:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):183:183 -> a
-    406:406:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):188:188 -> a
+    18:403:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):168 -> a
+    404:404:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):173:173 -> a
+    405:405:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:178 -> a
+    406:406:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):183:183 -> a
     1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> b
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):103 -> b
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):103:114 -> b
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    14:14:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117 -> b
-    15:26:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:131 -> b
-    27:27:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):152:152 -> b
-    boolean isConstClass() -> l1
-    boolean isOutConstant() -> q2
+    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
+    2:10:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:111 -> b
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    11:11:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117 -> b
+    12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> b
+    13:13:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):20:20 -> b
+    13:13:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):123 -> b
+    14:14:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> b
+    14:14:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):123 -> b
+    15:15:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):123:123 -> b
+    16:16:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):147:147 -> b
+    boolean isConstClass() -> j1
+    boolean isOutConstant() -> o2
     1:1:java.lang.String toString():83:83 -> toString
-    com.android.tools.r8.ir.code.ConstClass asConstClass() -> w
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.t.b.y:
+    com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.s.b.y:
     int $r8$clinit -> h
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
-    com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> K0
-    boolean hasInvariantOutType() -> P0
+    com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
+    boolean hasInvariantOutType() -> N0
     1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():0:106 -> a
-    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):54 -> a
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isConstInstruction() -> m1
-    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> x
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.t.b.z:
+    1:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):54 -> a
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isConstInstruction() -> k1
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.s.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> i
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:int maxInValueRegister():75:75 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():54:54 -> O2
-    boolean instructionTypeCanThrow() -> V0
-    1:337:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():0:336 -> a
-    1:337:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):82 -> a
-    338:338:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    339:339:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):46:46 -> a
-    340:340:com.android.tools.r8.graph.DexMethodHandle getValue():54:54 -> a
-    340:340:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):46 -> a
-    341:341:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):46:46 -> a
-    342:342:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    342:342:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    343:344:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    345:345:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):65:65 -> a
-    346:346:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):118:118 -> a
-    347:347:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):117:117 -> a
-    348:348:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):123:123 -> a
-    349:349:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):128:128 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:70 -> b
-    boolean isConstMethodHandle() -> n1
-    boolean isOutConstant() -> q2
-    1:1:java.lang.String toString():92:92 -> toString
-    com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> y
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.t.b.A:
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):26:27 -> <init>
+    1:1:int maxInValueRegister():76:76 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> M2
+    boolean instructionTypeCanThrow() -> T0
+    1:323:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():0:322 -> a
+    1:323:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):83 -> a
+    324:324:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    325:325:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47:47 -> a
+    326:326:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> a
+    326:326:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47 -> a
+    327:327:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):47:47 -> a
+    328:328:com.android.tools.r8.ir.code.Value dest():51:51 -> a
+    328:328:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
+    329:330:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:61 -> a
+    331:331:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):66:66 -> a
+    332:332:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):119:119 -> a
+    333:333:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):118:118 -> a
+    334:334:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):124:124 -> a
+    335:335:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):129:129 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    boolean isConstMethodHandle() -> l1
+    boolean isOutConstant() -> o2
+    1:1:java.lang.String toString():93:93 -> toString
+    com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.s.b.A:
     com.android.tools.r8.graph.DexProto methodType -> i
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:int maxInValueRegister():75:75 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexProto getValue():54:54 -> O2
-    boolean instructionTypeCanThrow() -> V0
-    1:341:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():0:340 -> a
-    1:341:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):128 -> a
-    342:342:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    343:343:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):46:46 -> a
-    344:344:com.android.tools.r8.graph.DexProto getValue():54:54 -> a
-    344:344:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):46 -> a
-    345:345:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):46:46 -> a
-    346:346:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    346:346:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59 -> a
-    347:348:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:60 -> a
-    349:349:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):65:65 -> a
-    350:350:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
-    351:351:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):111:111 -> a
-    352:352:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):117:117 -> a
-    353:353:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):122:122 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):70:70 -> b
-    boolean isConstMethodType() -> o1
-    boolean isOutConstant() -> q2
-    1:1:java.lang.String toString():86:86 -> toString
-    com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> z
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.t.b.B:
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):26:27 -> <init>
+    1:1:int maxInValueRegister():76:76 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexProto getValue():55:55 -> M2
+    boolean instructionTypeCanThrow() -> T0
+    1:327:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():0:326 -> a
+    1:327:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):129 -> a
+    328:328:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    329:329:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47:47 -> a
+    330:330:com.android.tools.r8.graph.DexProto getValue():55:55 -> a
+    330:330:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47 -> a
+    331:331:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):47:47 -> a
+    332:332:com.android.tools.r8.ir.code.Value dest():51:51 -> a
+    332:332:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
+    333:334:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:61 -> a
+    335:335:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):66:66 -> a
+    336:336:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):113:113 -> a
+    337:337:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):112:112 -> a
+    338:338:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):118:118 -> a
+    339:339:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):123:123 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
+    boolean isConstMethodType() -> m1
+    boolean isOutConstant() -> o2
+    1:1:java.lang.String toString():87:87 -> toString
+    com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.s.b.B:
     long value -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.ir.code.Value,long):38:43 -> <init>
-    com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> A
-    1:1:int maxInValueRegister():243:243 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value dest():72:72 -> O2
-    1:2:double getDoubleValue():96:97 -> P2
-    1:2:float getFloatValue():91:92 -> Q2
-    1:3:int getIntValue():80:80 -> R2
-    5:5:int getIntValue():82:82 -> R2
-    1:2:long getLongValue():86:87 -> S2
-    1:1:long getRawValue():101:101 -> T2
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:boolean is16Bit():282:282 -> U2
-    1:1:boolean is8Bit():274:274 -> V2
-    1:1:boolean isIntegerOne():113:113 -> W2
-    1:1:boolean isIntegerZero():109:109 -> X2
-    1:1:boolean isZero():105:105 -> Y2
-    1:1:boolean negativeIs16Bit():286:286 -> Z2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:3:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):61:63 -> a
-    4:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):67:68 -> a
-    6:6:com.android.tools.r8.ir.code.Value dest():72:72 -> a
-    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131 -> a
-    7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131:132 -> a
-    9:9:com.android.tools.r8.ir.code.Value dest():72:72 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):136 -> a
-    10:11:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):136:137 -> a
-    12:37:boolean com.android.tools.r8.ir.code.ValueType.isSingle():0:25 -> a
-    12:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
-    38:46:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):149:157 -> a
-    47:55:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138:146 -> a
-    56:60:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):117:121 -> a
-    61:61:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):164:164 -> a
-    62:65:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):169:172 -> a
-    66:66:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178:178 -> a
-    67:92:boolean com.android.tools.r8.ir.code.ValueType.isSingle():0:25 -> a
-    67:92:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):216 -> a
-    67:92:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178 -> a
-    93:109:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):217:233 -> a
-    93:109:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178 -> a
-    110:140:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):182:212 -> a
-    110:140:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178 -> a
-    141:258:boolean com.android.tools.r8.cf.code.CfConstNumber.isNegativeZeroDouble(double):0:117 -> a
-    141:258:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):205 -> a
-    141:258:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178 -> a
-    259:380:boolean com.android.tools.r8.cf.code.CfConstNumber.isNegativeZeroFloat(float):0:121 -> a
-    259:380:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):199 -> a
-    259:380:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):178 -> a
-    381:382:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):306:307 -> a
-    383:386:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):312:315 -> a
-    387:387:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):320:320 -> a
-    388:388:boolean outTypeKnownToBeBoolean(java.util.Set):332:332 -> a
-    389:389:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):337:337 -> a
-    1:1:boolean negativeIs8Bit():278:278 -> a3
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):266:270 -> b
-    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):325:326 -> b
-    boolean isConstNumber() -> p1
-    boolean isOutConstant() -> q2
-    1:4:java.lang.String toString():254:257 -> toString
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.t.b.C:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.ir.code.Value,long):40:45 -> <init>
+    1:1:int maxInValueRegister():245:245 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value dest():74:74 -> M2
+    1:2:double getDoubleValue():98:99 -> N2
+    1:2:float getFloatValue():93:94 -> O2
+    1:3:int getIntValue():82:82 -> P2
+    5:5:int getIntValue():84:84 -> P2
+    1:2:long getLongValue():88:89 -> Q2
+    1:1:long getRawValue():103:103 -> R2
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    1:1:boolean is16Bit():284:284 -> S2
+    1:1:boolean is8Bit():276:276 -> T2
+    1:1:boolean isIntegerOne():115:115 -> U2
+    1:1:boolean isIntegerZero():111:111 -> V2
+    1:1:boolean isZero():107:107 -> W2
+    1:1:boolean negativeIs16Bit():288:288 -> X2
+    1:1:boolean negativeIs8Bit():280:280 -> Y2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59:59 -> a
+    2:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):63:65 -> a
+    5:6:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):69:70 -> a
+    7:7:com.android.tools.r8.ir.code.Value dest():74:74 -> a
+    7:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):133 -> a
+    8:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):133:134 -> a
+    10:10:com.android.tools.r8.ir.code.Value dest():74:74 -> a
+    10:10:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138 -> a
+    11:12:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):138:139 -> a
+    13:38:boolean com.android.tools.r8.ir.code.ValueType.isSingle():0:25 -> a
+    13:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):139 -> a
+    39:47:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):151:159 -> a
+    48:56:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):140:148 -> a
+    57:61:boolean isIntegerNegativeOne(com.android.tools.r8.ir.code.NumericType):119:123 -> a
+    62:62:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):166:166 -> a
+    63:66:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):171:174 -> a
+    67:67:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180:180 -> a
+    68:93:boolean com.android.tools.r8.ir.code.ValueType.isSingle():0:25 -> a
+    68:93:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):218 -> a
+    68:93:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180 -> a
+    94:110:int estimatedDexSize(com.android.tools.r8.ir.code.ValueType,long):219:235 -> a
+    94:110:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180 -> a
+    111:141:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):184:214 -> a
+    111:141:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180 -> a
+    142:259:boolean com.android.tools.r8.cf.code.CfConstNumber.isNegativeZeroDouble(double):0:117 -> a
+    142:259:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):207 -> a
+    142:259:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180 -> a
+    260:381:boolean com.android.tools.r8.cf.code.CfConstNumber.isNegativeZeroFloat(float):0:121 -> a
+    260:381:int estimatedCfSize(com.android.tools.r8.ir.code.ValueType,long):201 -> a
+    260:381:int estimatedSize(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.code.ValueType,long):180 -> a
+    382:383:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):308:309 -> a
+    384:387:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):314:317 -> a
+    388:388:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):322:322 -> a
+    389:389:boolean outTypeKnownToBeBoolean(java.util.Set):334:334 -> a
+    390:390:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):340:340 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):268:272 -> b
+    6:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):327:328 -> b
+    boolean isConstNumber() -> n1
+    boolean isOutConstant() -> o2
+    1:4:java.lang.String toString():256:259 -> toString
+    com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.s.b.C:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> j
     com.android.tools.r8.graph.DexString value -> i
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):28:30 -> <init>
-    com.android.tools.r8.ir.code.ConstString asConstString() -> B
-    1:1:int maxInValueRegister():80:80 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexString getValue():59:59 -> O2
-    1:11:boolean instructionInstanceCanThrow():116:126 -> T0
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:boolean instructionTypeCanThrow():96:96 -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:2:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):50:51 -> a
-    3:3:com.android.tools.r8.graph.DexString getValue():59:59 -> a
-    3:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):51 -> a
-    4:4:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):51:51 -> a
-    5:5:com.android.tools.r8.ir.code.Value dest():55:55 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69 -> a
-    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:70 -> a
-    8:8:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    9:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135 -> a
-    10:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:135 -> a
-    11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):140:140 -> a
-    12:12:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    13:13:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):150:150 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):155:155 -> a
-    15:18:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:168 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isConstString() -> q1
-    boolean isOutConstant() -> q2
-    1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.t.b.D:
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):30:32 -> <init>
+    1:1:int maxInValueRegister():82:82 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> M2
+    1:11:boolean instructionInstanceCanThrow():118:128 -> R0
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    1:1:boolean instructionTypeCanThrow():98:98 -> T0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
+    2:3:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):52:53 -> a
+    4:4:com.android.tools.r8.graph.DexString getValue():61:61 -> a
+    4:4:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):53 -> a
+    5:5:com.android.tools.r8.ir.code.ConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstString):53:53 -> a
+    6:6:com.android.tools.r8.ir.code.Value dest():57:57 -> a
+    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
+    7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
+    9:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    10:10:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137 -> a
+    11:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):142:142 -> a
+    13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):147:147 -> a
+    14:14:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):152:152 -> a
+    15:15:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
+    16:19:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):168:171 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isConstString() -> o1
+    boolean isOutConstant() -> o2
+    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.D:
     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
     15:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
-    18:18:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    18:18:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
     18:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    20:20:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    20:20:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
     20:20:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
     21:21:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    22:22:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    22:22:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
     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.t.b.E:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.s.b.E:
     1:1:void <init>():19:19 -> <init>
-    1:1:int maxInValueRegister():59:59 -> I2
-    1:1:int maxOutValueRegister():64:64 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:int maxInValueRegister():59:59 -> G2
+    1:1:int maxOutValueRegister():64:64 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    boolean isAllowedAfterThrowingInstruction() -> V0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:111:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalRead():0:110 -> a
-    1:111:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
+    1:111:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):70 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    112:112:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:44 -> a
-    113:113:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):49:49 -> a
+    112:112:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
+    113:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:44 -> a
+    114:114:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):49:49 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isDebugLocalRead() -> u1
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.t.b.F:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isDebugLocalRead() -> s1
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.s.b.F:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    boolean isDebugLocalUninitialized() -> v1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.t.b.G:
+    boolean isAllowedAfterThrowingInstruction() -> V0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
+    boolean isDebugLocalUninitialized() -> t1
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.s.b.G:
     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>
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
-    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
-    3:3:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
+    boolean isAllowedAfterThrowingInstruction() -> V0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
+    2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
+    3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
+    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55:55 -> b
     2:3:boolean verifyTypes(com.android.tools.r8.graph.AppView):81:82 -> b
-    boolean isOutConstant() -> q2
-    boolean isDebugLocalWrite() -> w1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.t.b.H:
+    boolean isOutConstant() -> o2
+    boolean isDebugLocalWrite() -> u1
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.s.b.H:
     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
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> C
-    1:1:int maxInValueRegister():77:77 -> I2
-    1:1:int maxOutValueRegister():82:82 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> P2
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> A
+    1:1:int maxInValueRegister():77:77 -> G2
+    1:1:int maxOutValueRegister():82:82 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> N2
+    boolean isAllowedAfterThrowingInstruction() -> V0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:115:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugLocalsChange():0:114 -> a
-    1:115:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
-    116:116:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> a
-    116:116:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):108 -> a
-    117:119:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):108:110 -> a
-    120:120:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> a
-    120:120:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):114 -> a
-    121:124:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):114:117 -> a
-    125:125:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
-    126:126:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):124:124 -> a
-    127:127:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
+    1:115:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):103 -> a
+    116:116:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
+    117:117:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> a
+    117:117:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):108 -> a
+    118:120:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):108:110 -> a
+    121:121:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> a
+    121:121:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):114 -> a
+    122:125:boolean apply(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):114:117 -> a
+    126:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
+    127:127:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):124:124 -> a
+    128:128:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
     1:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:72 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:java.lang.String toString():92:97 -> toString
-    boolean isDebugLocalsChange() -> x1
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.t.b.I:
+    boolean isDebugLocalsChange() -> v1
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.s.b.I:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
-    com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> D
-    1:1:int maxInValueRegister():55:55 -> I2
-    1:1:int maxOutValueRegister():60:60 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> B
+    1:1:int maxInValueRegister():55:55 -> G2
+    1:1:int maxOutValueRegister():60:60 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    boolean isAllowedAfterThrowingInstruction() -> V0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDebugPosition():0:118 -> a
-    1:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
+    1:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):66 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    120:121:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:45 -> a
-    122:124:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:88 -> a
+    120:120:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
+    121:122:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):44:45 -> a
+    123:125:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:88 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isDebugPosition() -> y1
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.t.b.J:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isDebugPosition() -> w1
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.s.b.J:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -25172,7 +25394,7 @@
     1:1:com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration getInstance():15:15 -> a
     2:3:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:26 -> a
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20:20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.t.b.K:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.s.b.K:
     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
@@ -25187,56 +25409,56 @@
     2:2:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):179:179 -> a
     3:3:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):314:314 -> a
     4:4:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):319:319 -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.t.b.L:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.s.b.L:
     int $r8$clinit -> m
     com.android.tools.r8.graph.DexReference item -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> k
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> j
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> E
-    1:1:int maxInValueRegister():101:101 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexReference getItem():62:62 -> O2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():66:66 -> P2
-    boolean instructionInstanceCanThrow() -> T0
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    1:1:boolean instructionTypeCanThrow():117:117 -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):34:37 -> <init>
+    com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> C
+    1:1:int maxInValueRegister():102:102 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> M2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> N2
+    boolean instructionInstanceCanThrow() -> R0
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    1:1:boolean instructionTypeCanThrow():118:118 -> T0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:95: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):0:94 -> a
-    1:95:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):161 -> a
-    96:97:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):56:57 -> a
-    98:98:com.android.tools.r8.graph.DexReference getItem():62:62 -> a
-    98:98:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):58 -> a
-    99:99:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):58:58 -> a
-    100:101:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:87 -> a
-    102:102:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):140:140 -> a
-    103:103:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    104:104:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):150:150 -> a
-    105:105:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):155:155 -> a
-    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:96 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isOutConstant() -> q2
-    1:1:java.lang.String toString():112:112 -> toString
-    boolean isDexItemBasedConstString() -> z1
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.t.b.M:
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
+    2:3:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):57:58 -> a
+    4:4:com.android.tools.r8.graph.DexReference getItem():63:63 -> a
+    4:4:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):59 -> a
+    5:5:com.android.tools.r8.ir.code.DexItemBasedConstString copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.DexItemBasedConstString):59:59 -> a
+    6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:88 -> a
+    8:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):141:141 -> a
+    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):146:146 -> a
+    10:10:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):151:151 -> a
+    11:11:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):156:156 -> a
+    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):162:162 -> a
+    13:107: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.DexProgramClass):0:94 -> a
+    13:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):162 -> a
+    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:97 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isOutConstant() -> o2
+    1:1:java.lang.String toString():113:113 -> toString
+    boolean isDexItemBasedConstString() -> x1
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.s.b.M:
     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>
-    boolean isDiv() -> A1
-    com.android.tools.r8.ir.code.Div asDiv() -> F
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> T2
-    1:1:boolean instructionTypeCanThrow():134:134 -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    com.android.tools.r8.ir.code.Div asDiv() -> D
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> R2
+    1:1:boolean instructionTypeCanThrow():134:134 -> T0
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
-    2:2:int foldIntegers(int,int):114:114 -> a
-    3:3:long foldLongs(long,long):119:119 -> a
-    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):139:143 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
+    3:3:int foldIntegers(int,int):114:114 -> a
+    4:4:long foldLongs(long,long):119:119 -> a
+    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):139:143 -> a
     1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):64:64 -> b
     2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):89:89 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
@@ -25247,7 +25469,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.t.b.P:
+    boolean isDiv() -> y1
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.s.b.O:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -25257,132 +25480,135 @@
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):40:40 -> <init>
     2:56:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree$Assumption):30:84 -> <init>
-    1:1:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
-    2:8:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):134:140 -> a
-    2:8:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
-    9:16:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):157:164 -> a
-    17:22:java.util.List dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:176 -> a
-    23:24:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):189:190 -> a
-    25:54:void build():252:281 -> a
-    55:56:boolean recordChangesToControlFlowEdges(java.util.List):316:317 -> a
-    1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> b
-    3:30:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):191:218 -> b
-    31:31:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():232:232 -> b
-    32:32:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):243:243 -> b
-    32:32:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):292 -> b
-    33:33:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):293:293 -> b
-    34:34:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):243:243 -> b
-    34:34:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):295 -> b
-    35:35:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296:296 -> b
-    1:4:java.lang.Iterable normalExitDominatorBlocks():225:228 -> c
-    5:5:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):329:329 -> c
-    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.t.b.N:
+    1:2:com.android.tools.r8.ir.code.BasicBlock immediateDominator(com.android.tools.r8.ir.code.BasicBlock):91:92 -> a
+    3:3:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):103:103 -> a
+    4:10:boolean strictlyDominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):134:140 -> a
+    4:10:boolean dominatedBy(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):107 -> a
+    11:18:com.android.tools.r8.ir.code.BasicBlock closestDominator(java.util.Collection):157:164 -> a
+    19:23:java.util.Collection dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock,java.util.Collection):176:180 -> a
+    24:25:java.lang.Iterable dominatorBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):193:194 -> a
+    26:55:void build():256:285 -> a
+    56:57:boolean recordChangesToControlFlowEdges(java.util.List):320:321 -> a
+    1:28:java.util.Iterator lambda$dominatorBlocks$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree$Inclusive):195:222 -> b
+    29:29:com.android.tools.r8.ir.code.BasicBlock[] getSortedBlocks():236:236 -> b
+    30:30:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> b
+    30:30:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):296 -> b
+    31:31:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):297:297 -> b
+    32:32:boolean postorderCompareLess(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):247:247 -> b
+    32:32:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):299 -> b
+    33:33:com.android.tools.r8.ir.code.BasicBlock intersect(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:300 -> b
+    34:34:void onPredecessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):333:333 -> b
+    1:4:java.lang.Iterable normalExitDominatorBlocks():229:232 -> c
+    5:5:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> c
+    1:2:void numberBlocks():240:241 -> d
+    1:9:java.lang.String toString():308:316 -> toString
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.s.b.N:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> b
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.code.BasicBlock current -> a
-    1:1:void <clinit>():192:192 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):192:193 -> <init>
-    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$Inclusive -> com.android.tools.r8.t.b.O:
+    1:1:void <clinit>():196:196 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):196:197 -> <init>
+    1:1:boolean hasNext():201:201 -> hasNext
+    1:9:com.android.tools.r8.ir.code.BasicBlock next():206:214 -> next
+    1:9:java.lang.Object next():196 -> next
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.s.b.O$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.P:
     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.t.b.S:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.s.b.S:
     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>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    boolean isDup() -> B1
-    com.android.tools.r8.ir.code.Dup asDup() -> G
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():92:92 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> O2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> O2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> P2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> P2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> P2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> Q2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    com.android.tools.r8.ir.code.Dup asDup() -> E
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():92:92 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> M2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> M2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> N2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> N2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> N2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> O2
     1:123:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDup():0:122 -> a
-    1:123:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):98 -> a
+    1:123:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):98 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    124:124:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
-    125:128:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:76 -> a
+    124:124:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
+    125:125:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
+    126:129:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):73:76 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.t.b.Q:
+    boolean isDup() -> z1
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.s.b.Q:
     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>
     2:7:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:40 -> <init>
-    boolean isDup2() -> C1
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():106:106 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    boolean isDup2() -> A1
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():106:106 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
     1:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDup2():0:126 -> a
-    1:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):112 -> a
+    1:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):112 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    128:128:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
-    129:129:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):91:91 -> a
+    128:128:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50:50 -> a
+    129:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:86 -> a
+    130:130:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):91:91 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.t.b.T:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.s.b.T:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):34:34 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):38:40 -> <init>
-    boolean isFieldInstruction() -> E1
-    com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> H
-    1:1:com.android.tools.r8.graph.DexField getField():50:50 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():46:46 -> P2
-    com.android.tools.r8.ir.code.Value value() -> Q2
-    1:1:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):141:141 -> a
-    2:24:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):190:212 -> a
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    25:25:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):212 -> a
-    26:37:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):216:227 -> a
-    38:39:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):232:233 -> a
-    40:40:com.android.tools.r8.graph.DexField getField():50:50 -> a
-    40:40:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):233 -> a
-    41:45:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):233:237 -> a
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65:65 -> b
-    2:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):71:77 -> b
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    9:9:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):80 -> b
-    10:22:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):82:94 -> b
-    23:23:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> b
-    23:23:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():156 -> b
-    23:23:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):98 -> b
-    24:53:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):99:128 -> b
-    54:1545:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeClassIsAlreadyInitialized():0:1491 -> b
-    54:1545:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):128 -> b
-    1546:1557:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):131:142 -> b
-    1558:1566:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):138:146 -> b
-    1567:1567:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):104:104 -> b
-    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:162 -> f
-    7:7:com.android.tools.r8.graph.DexField getField():50:50 -> f
-    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163 -> f
-    8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:168 -> f
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> f
-    12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):168 -> f
-    13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170:180 -> f
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.t.b.U:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):32:32 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):36:38 -> <init>
+    boolean isFieldInstruction() -> C1
+    com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> F
+    1:1:com.android.tools.r8.graph.DexField getField():48:48 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():44:44 -> N2
+    com.android.tools.r8.ir.code.Value value() -> O2
+    1:1:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):115:115 -> a
+    2:24:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):164:186 -> a
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    25:25:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):186 -> a
+    26:37:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):190:201 -> a
+    38:39:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):207:208 -> a
+    40:40:com.android.tools.r8.graph.DexField getField():48:48 -> a
+    40:40:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):208 -> a
+    41:45:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):208:212 -> a
+    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):63:63 -> b
+    2:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):69:73 -> b
+    7:7:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> b
+    7:7:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):75 -> b
+    8:21:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):75:88 -> b
+    22:1501:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeReceiverIsNotNull():0:1479 -> b
+    22:1501:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):89 -> b
+    1502:1514:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):90:102 -> b
+    1515:2990:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeClassIsAlreadyInitialized():0:1475 -> b
+    1515:2990:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):102 -> b
+    2991:3002:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):105:116 -> b
+    3003:3003:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):112:112 -> b
+    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):131:136 -> f
+    7:7:com.android.tools.r8.graph.DexField getField():48:48 -> f
+    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> f
+    8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):139:142 -> f
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> f
+    12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> f
+    13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:154 -> f
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.s.b.U:
     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
@@ -25411,7 +25637,7 @@
     43:43:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType fromTypeDescriptorChar(char):30:30 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.t.b.V:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.s.b.V:
     boolean $assertionsDisabled -> r
     int register -> q
     1:1:void <clinit>():12:12 -> <clinit>
@@ -25424,25 +25650,25 @@
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     1:1:int getRegister():50:50 -> h0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.t.b.W:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.s.b.W:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
-    boolean isGoto() -> G1
-    com.android.tools.r8.ir.code.Goto asGoto() -> I
-    1:1:int maxInValueRegister():59:59 -> I2
-    1:1:int maxOutValueRegister():65:65 -> J2
-    int opcode() -> K2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> P2
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    boolean isGoto() -> E1
+    com.android.tools.r8.ir.code.Goto asGoto() -> G
+    1:1:int maxInValueRegister():59:59 -> G2
+    1:1:int maxOutValueRegister():65:65 -> H2
+    int opcode() -> I2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> N2
+    boolean isAllowedAfterThrowingInstruction() -> V0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
-    2:3:void print(com.android.tools.r8.utils.CfgPrinter):79:80 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
+    3:4:void print(com.android.tools.r8.utils.CfgPrinter):79:80 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.t.b.X:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.s.b.X:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     boolean $assertionsDisabled -> k
     boolean numbered -> e
@@ -25539,11 +25765,11 @@
     12:14:boolean lambda$verifyNoNullabilityBottomTypes$9(com.android.tools.r8.ir.code.Value):945:945 -> b
     15:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$10(com.android.tools.r8.ir.code.Instruction):956:956 -> b
     16:16:java.lang.Iterable instructions(java.util.function.Predicate):1006:1006 -> b
-    17:17:java.util.ListIterator listIterator(int):1032:1032 -> b
+    17:17:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1032:1032 -> b
     18:23:boolean computeAllThrowingInstructionsHavePositions():1166:1171 -> b
     1:53:java.util.Map computeLiveAtEntrySets():166:218 -> c
     54:74:java.util.Map computeLiveAtEntrySets():217:237 -> c
-    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> c
+    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> c
     75:75:java.util.Map computeLiveAtEntrySets():241 -> c
     76:111:java.util.Map computeLiveAtEntrySets():241:276 -> c
     112:112:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():91:91 -> c
@@ -25606,7 +25832,7 @@
     1:1:boolean isConsistentSSABeforeTypesAreCorrect():571:571 -> s
     2:22:boolean consistentDefUseChains():660:680 -> s
     2:22:boolean isConsistentSSABeforeTypesAreCorrect():572 -> s
-    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> s
+    23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> s
     23:23:boolean consistentDefUseChains():682 -> s
     23:23:boolean isConsistentSSABeforeTypesAreCorrect():572 -> s
     24:36:boolean consistentDefUseChains():682:694 -> s
@@ -25629,7 +25855,7 @@
     44:45:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):720:721 -> s
     44:45:boolean consistentDefUseChains():695 -> s
     44:45:boolean isConsistentSSABeforeTypesAreCorrect():572 -> s
-    46:46:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> s
+    46:46:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> s
     46:46:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):721 -> s
     46:46:boolean consistentDefUseChains():695 -> s
     46:46:boolean isConsistentSSABeforeTypesAreCorrect():572 -> s
@@ -25643,7 +25869,7 @@
     75:86:boolean noCriticalEdges():631:642 -> s
     75:86:boolean isConsistentSSABeforeTypesAreCorrect():574 -> s
     87:88:boolean isConsistentSSABeforeTypesAreCorrect():574:575 -> s
-    1:1:java.util.ListIterator listIterator():1028:1028 -> t
+    1:1:com.android.tools.r8.ir.code.BasicBlockIterator listIterator():1028:1028 -> t
     1:7:java.lang.String toString():463:469 -> toString
     1:1:com.android.tools.r8.ir.code.IRMetadata metadata():146:146 -> u
     1:1:com.android.tools.r8.graph.DexEncodedMethod method():155:155 -> v
@@ -25657,10 +25883,10 @@
     28:29:void prepareBlocksForCatchHandlers():345 -> y
     30:36:void prepareBlocksForCatchHandlers():346:352 -> y
     1:1:boolean removeAllDeadAndTrivialPhis():1179:1179 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.t.b.X$a:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.s.b.X$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):99:100 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.t.b.X$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.s.b.X$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
@@ -25669,7 +25895,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):72:76 -> <init>
     1:2:boolean equals(java.lang.Object):86:87 -> equals
     1:1:int hashCode():81:81 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.t.b.Y:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.s.b.Y:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -25684,7 +25910,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.t.b.Z:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.s.b.Z:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> c
@@ -25720,19 +25946,19 @@
     1:1:void set(java.lang.Object):19:19 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):150:150 -> set
     2:2:void set(java.lang.Object):19 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.t.b.a0:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.s.b.a0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):23:29 -> a
-    8:17:java.util.Map findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):48:57 -> a
-    18:44:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):72:98 -> a
-    45:73:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):115:143 -> a
-    74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():94:94 -> a
-    74:74:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):144 -> a
-    75:78:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):144:147 -> a
-    1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):110:110 -> b
-    2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):109:109 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.t.b.b0:
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
+    8:18:java.util.Map findUniqueStaticPuts(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.Set):51:61 -> a
+    19:45:void removeArrayAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):76:102 -> a
+    46:74:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):119:147 -> a
+    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():92:92 -> a
+    75:75:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148 -> a
+    76:79:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
+    1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> b
+    2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:113 -> b
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.s.b.b0:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -25852,49 +26078,49 @@
     1:1:boolean mayHaveInvokeSuper():202:202 -> x
     1:1:boolean mayHaveInvokeVirtual():206:206 -> y
     1:1:boolean mayHaveMonitorInstruction():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.t.b.c0:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.s.b.c0:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.ir.code.If$Type type -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.Value):73:74 -> <init>
     3:4:void <init>(com.android.tools.r8.ir.code.If$Type,java.util.List):78:79 -> <init>
-    boolean isIf() -> H1
-    1:1:int maxInValueRegister():174:174 -> I2
-    com.android.tools.r8.ir.code.If asIf() -> J
-    1:1:int maxOutValueRegister():179:179 -> J2
-    int opcode() -> K2
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> O2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> P2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> Q2
-    1:2:void invert():110:111 -> R2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> R2
-    3:4:void invert():112 -> R2
-    5:5:void invert():113:113 -> R2
-    1:1:boolean isZeroTest():93:93 -> S2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> T2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> U2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> V2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    boolean isIf() -> F1
+    1:1:int maxInValueRegister():182:182 -> G2
+    com.android.tools.r8.ir.code.If asIf() -> H
+    1:1:int maxOutValueRegister():187:187 -> H2
+    int opcode() -> I2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():140:143 -> M2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():125:128 -> N2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():114:114 -> O2
+    1:2:void invert():118:119 -> P2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):148:149 -> P2
+    3:4:void invert():120 -> P2
+    5:5:void invert():121:121 -> P2
+    1:1:boolean isZeroTest():101:101 -> Q2
+    1:1:com.android.tools.r8.ir.code.Value lhs():105:105 -> R2
+    1:2:com.android.tools.r8.ir.code.Value rhs():109:110 -> S2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> T2
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
-    4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
-    5:6:void print(com.android.tools.r8.utils.CfgPrinter):185:186 -> a
-    7:9:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):201:203 -> a
-    10:13:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):207:210 -> a
-    14:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):250:250 -> a
-    15:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):255:262 -> a
-    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> b
-    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):191:196 -> b
-    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):220:235 -> b
-    25:25:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):233:233 -> b
-    26:26:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):231:231 -> b
-    27:27:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):229:229 -> b
-    28:28:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):227:227 -> b
-    29:29:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):225:225 -> b
-    30:30: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.t.b.c0$a:
+    4:4:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):89:89 -> a
+    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):154:154 -> a
+    6:7:void print(com.android.tools.r8.utils.CfgPrinter):193:194 -> a
+    8:10:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber):209:211 -> a
+    11:14:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(com.android.tools.r8.ir.code.ConstNumber,com.android.tools.r8.ir.code.ConstNumber):215:218 -> a
+    15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):258:258 -> a
+    16:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):263:270 -> a
+    1:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):148:149 -> b
+    3:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):199:204 -> b
+    9:24:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):228:243 -> b
+    25:25:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):241:241 -> b
+    26:26:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):239:239 -> b
+    27:27:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):237:237 -> b
+    28:28:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):235:235 -> b
+    29:29:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):233:233 -> b
+    30:30:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):231:231 -> b
+    1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):132:135 -> c
+    1:8:java.lang.String toString():169:176 -> toString
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.s.b.c0$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
@@ -25912,164 +26138,174 @@
     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.t.b.d0:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.s.b.d0:
     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.t.b.e0:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.s.b.e0:
     boolean $assertionsDisabled -> i
     int increment -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,int):25:27 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):70:70 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    3:3:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):81:81 -> a
-    4:14:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    2:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):70:70 -> a
+    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    4:4:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):81:81 -> a
+    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
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.t.b.f0:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.s.b.f0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):31:35 -> <init>
-    boolean isInitClass() -> I1
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    com.android.tools.r8.ir.code.InitClass asInitClass() -> K
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexType getClassValue():39:39 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):54:54 -> a
-    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64:64 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:70 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):75:75 -> a
-    6:6:boolean definitelyTriggersClassInitialization(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):85:85 -> a
-    7:7:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102:102 -> a
-    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):112:112 -> 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):150:150 -> a
-    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):155:155 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
-    2:9:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> b
-    10:17:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:106 -> b
-    18:18:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):123:123 -> b
-    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:124 -> d
-    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:128 -> d
-    1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.t.b.g0:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:36 -> <init>
+    boolean isInitClass() -> G1
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    com.android.tools.r8.ir.code.InitClass asInitClass() -> I
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexType getClassValue():40:40 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):55:55 -> a
+    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65:65 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:71 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
+    6:6:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):86:86 -> a
+    7:7:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):109:109 -> a
+    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):119:119 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):162:162 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
+    2:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97:97 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97 -> b
+    4:4:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):20:20 -> b
+    4:4:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
+    5:5:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> b
+    5:5:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
+    6:13:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:110 -> b
+    14:14:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:106 -> b
+    15:15:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):130:130 -> b
+    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124:131 -> d
+    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:135 -> d
+    1:1:java.lang.String toString():172:172 -> toString
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.s.b.g0:
     com.android.tools.r8.ir.code.Value object() -> f
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.t.b.h0:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.s.b.h0:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():33:33 -> <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):36:36 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():218:218 -> I0
-    int maxInValueRegister() -> I2
-    boolean isInstanceFieldInstruction() -> J1
-    int maxOutValueRegister() -> J2
-    boolean isInstanceGet() -> K1
-    int opcode() -> K2
-    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> L
-    com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> M
-    boolean throwsOnNullInput() -> N2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> Q2
-    boolean instructionTypeCanThrow() -> V0
-    1:1:boolean outTypeKnownToBeBoolean(java.util.Set):46:46 -> a
-    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51:51 -> a
-    3:3:com.android.tools.r8.ir.code.Value dest():55:55 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78 -> a
-    4:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:107 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):89:89 -> a
-    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:109 -> a
-    65:67:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):71:73 -> a
-    68:68:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):120:120 -> a
-    69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):130:130 -> a
-    70:70:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    70:70:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):130 -> a
-    71:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):155:155 -> a
-    72:72:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):185:185 -> a
-    73:73:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):190:190 -> a
-    74:75:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):195:196 -> a
-    76:79:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):201:201 -> a
-    80:80:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):208:208 -> a
-    81:81:boolean definitelyTriggersClassInitialization(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):228:228 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):145:149 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> f
-    1:1:java.lang.String toString():180:180 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.t.b.i0:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():220:220 -> G0
+    int maxInValueRegister() -> G2
+    boolean isInstanceFieldInstruction() -> H1
+    int maxOutValueRegister() -> H2
+    boolean isInstanceGet() -> I1
+    int opcode() -> I2
+    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
+    com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> K
+    boolean throwsOnNullInput() -> L2
+    1:1:com.android.tools.r8.ir.code.Value value():68:68 -> O2
+    boolean instructionTypeCanThrow() -> T0
+    1:1:boolean outTypeKnownToBeBoolean(java.util.Set):48:48 -> a
+    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53:53 -> a
+    3:3:com.android.tools.r8.ir.code.Value dest():57:57 -> a
+    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80 -> a
+    4:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:109 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:106 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):103:103 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):97:97 -> a
+    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):94:94 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
+    40:64:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):87:111 -> a
+    65:67:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):73:75 -> a
+    68:68:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):122:122 -> a
+    69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):132:132 -> a
+    70:70:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    70:70:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):132 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):157:157 -> a
+    72:72:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):187:187 -> a
+    73:73:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):192:192 -> a
+    74:75:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:198 -> a
+    76:79:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
+    80:80:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):210:210 -> a
+    81:81:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):230:230 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):147:151 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:2:com.android.tools.r8.ir.code.Value object():62:63 -> f
+    1:1:java.lang.String toString():182:182 -> toString
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.s.b.i0:
     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() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    boolean isInstanceOf() -> L1
-    com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> N
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> P2
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    boolean isInstanceOf() -> J1
+    com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
+    1:1:com.android.tools.r8.graph.DexType type():40:40 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.Value value():48:48 -> N2
+    boolean instructionTypeCanThrow() -> T0
     boolean outTypeKnownToBeBoolean(java.util.Set) -> a
-    1:1:com.android.tools.r8.ir.code.Value dest():43:43 -> a
-    1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
-    2:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52: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):90:90 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):95:95 -> a
-    7:8:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
-    9:9:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
-    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.t.b.j0:
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():44:44 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53 -> a
+    3:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):53:55 -> a
+    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
+    8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):106:107 -> a
+    10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):112:112 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.s.b.j0:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:36 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,boolean):48:51 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():246:246 -> I0
-    int maxInValueRegister() -> I2
-    boolean isInstanceFieldInstruction() -> J1
-    1:1:int maxOutValueRegister():187:187 -> J2
-    int opcode() -> K2
-    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> L
-    boolean isInstancePut() -> M1
-    boolean throwsOnNullInput() -> N2
-    com.android.tools.r8.ir.code.InstancePut asInstancePut() -> O
-    1:1:com.android.tools.r8.ir.code.Value value():72:72 -> Q2
-    boolean instructionTypeCanThrow() -> V0
-    1:1:com.android.tools.r8.ir.code.InstancePut createPotentiallyInvalid(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):44:44 -> a
-    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62:62 -> a
-    3:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:106 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):103:103 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:100 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):97:97 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):94:94 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:88 -> a
-    38:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):84:108 -> a
-    63:74:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):119:130 -> a
-    75:75:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145:145 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    76:76:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):145 -> a
-    77:77:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):146:146 -> a
-    78:88:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):153:163 -> a
-    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):194:194 -> a
-    90:90:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):224:224 -> a
-    91:94:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):229:229 -> a
-    95:95:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):236:236 -> a
-    96:96:boolean definitelyTriggersClassInitialization(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):256:256 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):173:177 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.ir.code.Value object():67:67 -> f
-    1:1:java.lang.String toString():219:219 -> toString
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.t.b.k0:
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:37 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,boolean):49:52 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():253:253 -> G0
+    int maxInValueRegister() -> G2
+    boolean isInstanceFieldInstruction() -> H1
+    1:1:int maxOutValueRegister():194:194 -> H2
+    int opcode() -> I2
+    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
+    boolean isInstancePut() -> K1
+    boolean throwsOnNullInput() -> L2
+    com.android.tools.r8.ir.code.InstancePut asInstancePut() -> M
+    1:1:com.android.tools.r8.ir.code.Value value():73:73 -> O2
+    boolean instructionTypeCanThrow() -> T0
+    1:1:com.android.tools.r8.ir.code.InstancePut createPotentiallyInvalid(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):45:45 -> a
+    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):63:63 -> a
+    3:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:107 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):101:101 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:95 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):92:92 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):89:89 -> a
+    38:62:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):85:109 -> a
+    63:73:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):120:130 -> a
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():46:46 -> a
+    74:74:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132 -> a
+    75:80:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):132:137 -> a
+    81:81:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):152:152 -> a
+    82:82:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    82:82:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):152 -> a
+    83:83:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
+    84:94:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):160:170 -> a
+    95:95:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):201:201 -> a
+    96:96:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):231:231 -> a
+    97:100:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):236:236 -> a
+    101:101:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):243:243 -> a
+    102:102:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):263:263 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):180:184 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:com.android.tools.r8.ir.code.Value object():68:68 -> f
+    1:1:java.lang.String toString():226:226 -> toString
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.s.b.k0:
     java.util.List inValues -> b
     java.util.LinkedHashSet debugValues -> e
     boolean $assertionsDisabled -> g
@@ -26077,289 +26313,286 @@
     com.android.tools.r8.ir.code.Value outValue -> a
     com.android.tools.r8.ir.code.BasicBlock block -> c
     com.android.tools.r8.ir.code.Position position -> f
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value):53:53 -> <init>
-    2:10:void <init>(com.android.tools.r8.ir.code.Value):46:54 -> <init>
-    11:11:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):57:57 -> <init>
-    12:25:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):46:59 -> <init>
-    26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):62:62 -> <init>
-    27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):46:68 -> <init>
-    com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> A
-    com.android.tools.r8.ir.code.Throw asThrow() -> A0
-    boolean isDiv() -> A1
-    boolean isStringSwitch() -> A2
-    com.android.tools.r8.ir.code.ConstString asConstString() -> B
-    com.android.tools.r8.ir.code.Ushr asUshr() -> B0
-    boolean isDup() -> B1
-    boolean isSub() -> B2
-    com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> C
-    com.android.tools.r8.ir.code.Xor asXor() -> C0
-    boolean isDup2() -> C1
-    boolean isSwap() -> C2
-    com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> D
-    1:2:void clearBlock():288:289 -> D0
-    1:1:boolean isFieldGet():929:929 -> D1
-    boolean isSwitch() -> D2
-    com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> E
-    1:5:void clearDebugValues():259:263 -> E0
-    boolean isFieldInstruction() -> E1
-    boolean isThrow() -> E2
-    com.android.tools.r8.ir.code.Div asDiv() -> F
-    1:7:boolean definesValueWithNonLocalUsages():544:550 -> F0
-    1:7:boolean definesBlockLocalValue():540 -> F0
-    1:1:boolean isFieldPut():933:933 -> F1
-    boolean isUnop() -> F2
-    com.android.tools.r8.ir.code.Dup asDup() -> G
-    1:1:java.util.Set getDebugValues():651:651 -> G0
-    boolean isGoto() -> G1
-    boolean isUshr() -> G2
-    com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> H
-    1:1:java.lang.String getInstructionName():308:308 -> H0
-    boolean isIf() -> H1
-    boolean isXor() -> H2
-    com.android.tools.r8.ir.code.Goto asGoto() -> I
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1451:1451 -> I0
-    boolean isInitClass() -> I1
-    int maxInValueRegister() -> I2
-    com.android.tools.r8.ir.code.If asIf() -> J
-    1:1:int getNumber():357:357 -> J0
-    boolean isInstanceFieldInstruction() -> J1
-    int maxOutValueRegister() -> J2
-    com.android.tools.r8.ir.code.InitClass asInitClass() -> K
-    com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> K0
-    boolean isInstanceGet() -> K1
-    int opcode() -> K2
-    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> L
-    1:2:com.android.tools.r8.ir.code.Position getPosition():80:81 -> L0
-    boolean isInstanceOf() -> L1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():177:177 -> L2
-    com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> M
-    1:1:java.lang.String getPositionAsString():90:90 -> M0
-    boolean isInstancePut() -> M1
-    1:1:com.android.tools.r8.ir.code.Value outValue():121:121 -> M2
-    com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> N
-    1:1:boolean hasBlock():304:304 -> N0
-    boolean isIntSwitch() -> N1
-    boolean throwsOnNullInput() -> N2
-    com.android.tools.r8.ir.code.InstancePut asInstancePut() -> O
-    1:1:java.util.List inValues():94:94 -> O0
-    1:1:boolean hasInValueWithLocalInfo():108 -> O0
-    2:3:boolean hasInValueWithLocalInfo():108:109 -> O0
-    boolean isInvoke() -> O1
-    com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> P
-    boolean hasInvariantOutType() -> P0
-    boolean isInvokeCustom() -> P1
-    com.android.tools.r8.ir.code.Invoke asInvoke() -> Q
-    1:1:boolean hasOutValue():117:117 -> Q0
-    boolean isInvokeDirect() -> Q1
-    com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> R
-    1:1:boolean hasPosition():76:76 -> R0
-    boolean isInvokeInterface() -> R1
-    com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> S
-    1:1:java.util.List inValues():94:94 -> S0
-    boolean isInvokeMethod() -> S1
-    com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> T
-    1:1:boolean instructionInstanceCanThrow():570:570 -> T0
-    1:1:boolean isInvokeMethodWithDynamicDispatch():1209:1209 -> T1
-    com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> U
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    boolean isInvokeMethodWithReceiver() -> U1
-    com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> V
-    boolean instructionTypeCanThrow() -> V0
-    boolean isInvokeMultiNewArray() -> V1
-    com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> W
-    boolean isAdd() -> W0
-    boolean isInvokeNewArray() -> W1
-    com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> X
-    boolean isAllowedAfterThrowingInstruction() -> X0
-    boolean isInvokePolymorphic() -> X1
-    com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> Y
-    boolean isAnd() -> Y0
-    boolean isInvokeStatic() -> Y1
-    com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Z
-    boolean isArgument() -> Z0
-    boolean isInvokeSuper() -> Z1
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value):51:51 -> <init>
+    2:10:void <init>(com.android.tools.r8.ir.code.Value):44:52 -> <init>
+    11:11:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):55:55 -> <init>
+    12:25:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):44:57 -> <init>
+    26:26:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):60:60 -> <init>
+    27:49:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):44:66 -> <init>
+    com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> A
+    com.android.tools.r8.ir.code.Xor asXor() -> A0
+    boolean isDup2() -> A1
+    boolean isSwap() -> A2
+    com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> B
+    1:2:void clearBlock():287:288 -> B0
+    1:1:boolean isFieldGet():913:913 -> B1
+    boolean isSwitch() -> B2
+    com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> C
+    1:5:void clearDebugValues():258:262 -> C0
+    boolean isFieldInstruction() -> C1
+    boolean isThrow() -> C2
+    com.android.tools.r8.ir.code.Div asDiv() -> D
+    1:7:boolean definesValueWithNonLocalUsages():544:550 -> D0
+    1:7:boolean definesBlockLocalValue():540 -> D0
+    1:1:boolean isFieldPut():917:917 -> D1
+    boolean isUnop() -> D2
+    com.android.tools.r8.ir.code.Dup asDup() -> E
+    1:1:java.util.Set getDebugValues():651:651 -> E0
+    boolean isGoto() -> E1
+    boolean isUshr() -> E2
+    com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> F
+    1:1:java.lang.String getInstructionName():307:307 -> F0
+    boolean isIf() -> F1
+    boolean isXor() -> F2
+    com.android.tools.r8.ir.code.Goto asGoto() -> G
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1435:1435 -> G0
+    boolean isInitClass() -> G1
+    int maxInValueRegister() -> G2
+    com.android.tools.r8.ir.code.If asIf() -> H
+    1:1:int getNumber():356:356 -> H0
+    boolean isInstanceFieldInstruction() -> H1
+    int maxOutValueRegister() -> H2
+    com.android.tools.r8.ir.code.InitClass asInitClass() -> I
+    com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
+    boolean isInstanceGet() -> I1
+    int opcode() -> I2
+    com.android.tools.r8.ir.code.InstanceFieldInstruction asInstanceFieldInstruction() -> J
+    1:2:com.android.tools.r8.ir.code.Position getPosition():78:79 -> J0
+    boolean isInstanceOf() -> J1
+    1:1:com.android.tools.r8.ir.code.ValueType outType():176:176 -> J2
+    com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> K
+    1:1:java.lang.String getPositionAsString():88:88 -> K0
+    boolean isInstancePut() -> K1
+    1:1:com.android.tools.r8.ir.code.Value outValue():119:119 -> K2
+    com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
+    1:1:boolean hasBlock():303:303 -> L0
+    boolean isIntSwitch() -> L1
+    boolean throwsOnNullInput() -> L2
+    com.android.tools.r8.ir.code.InstancePut asInstancePut() -> M
+    1:1:java.util.List inValues():92:92 -> M0
+    1:1:boolean hasInValueWithLocalInfo():106 -> M0
+    2:3:boolean hasInValueWithLocalInfo():106:107 -> M0
+    boolean isInvoke() -> M1
+    com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> N
+    boolean hasInvariantOutType() -> N0
+    boolean isInvokeCustom() -> N1
+    com.android.tools.r8.ir.code.Invoke asInvoke() -> O
+    1:1:boolean hasOutValue():115:115 -> O0
+    boolean isInvokeDirect() -> O1
+    com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> P
+    1:1:boolean hasPosition():74:74 -> P0
+    boolean isInvokeInterface() -> P1
+    com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> Q
+    1:1:java.util.List inValues():92:92 -> Q0
+    boolean isInvokeMethod() -> Q1
+    com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> R
+    1:1:boolean instructionInstanceCanThrow():570:570 -> R0
+    1:1:boolean isInvokeMethodWithDynamicDispatch():1193:1193 -> R1
+    com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> S
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    boolean isInvokeMethodWithReceiver() -> S1
+    com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> T
+    boolean instructionTypeCanThrow() -> T0
+    boolean isInvokeMultiNewArray() -> T1
+    com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> U
+    boolean isAdd() -> U0
+    boolean isInvokeNewArray() -> U1
+    com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> V
+    boolean isAllowedAfterThrowingInstruction() -> V0
+    boolean isInvokePolymorphic() -> V1
+    com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> W
+    boolean isAnd() -> W0
+    boolean isInvokeStatic() -> W1
+    com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> X
+    boolean isArgument() -> X0
+    boolean isInvokeSuper() -> X1
+    com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> Y
+    boolean isArithmeticBinop() -> Y0
+    boolean isInvokeVirtual() -> Y1
+    com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> Z
+    boolean isArrayAccess() -> Z0
+    boolean isJumpInstruction() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value) -> a
-    boolean definitelyTriggersClassInitialization(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) -> a
-    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType) -> a
+    boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption) -> a
+    com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
     boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator) -> a
     boolean outTypeKnownToBeBoolean(java.util.Set) -> a
-    boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
-    1:2:void setPosition(com.android.tools.r8.ir.code.Position):85:86 -> a
-    3:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):143:144 -> a
-    5:10:void addDebugValue(com.android.tools.r8.ir.code.Value):156:161 -> a
-    11:17:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):166:172 -> a
-    18:21:void replaceValue(int,com.android.tools.r8.ir.code.Value):194:197 -> a
-    22:31:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):201:210 -> a
-    32:38:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):244:250 -> a
-    39:40:void setBlock(com.android.tools.r8.ir.code.BasicBlock):280:281 -> a
-    41:41:void print(com.android.tools.r8.utils.CfgPrinter):332:332 -> a
+    boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
+    1:2:void setPosition(com.android.tools.r8.ir.code.Position):83:84 -> a
+    3:4:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142:143 -> a
+    5:10:void addDebugValue(com.android.tools.r8.ir.code.Value):155:160 -> a
+    11:17:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):165:171 -> a
+    18:21:void replaceValue(int,com.android.tools.r8.ir.code.Value):193:196 -> a
+    22:31:void replaceDebugValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):200:209 -> a
+    32:38:com.android.tools.r8.ir.code.Value removeDebugValue(com.android.tools.r8.graph.DebugLocalInfo):243:249 -> a
+    39:40:void setBlock(com.android.tools.r8.ir.code.BasicBlock):279:280 -> a
+    41:41:void print(com.android.tools.r8.utils.CfgPrinter):331:331 -> a
     42:62:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():0:20 -> a
-    42:62:void print(com.android.tools.r8.utils.CfgPrinter):333 -> a
-    63:74:void print(com.android.tools.r8.utils.CfgPrinter):335:346 -> a
-    75:76:void setNumber(int):361:362 -> a
-    77:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467:476 -> a
-    87:88:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):375:376 -> a
-    87:88:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):473 -> a
-    89:89:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):479:479 -> a
-    90:93:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):102:105 -> a
-    90:93:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):479 -> a
-    94:95:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):482:483 -> a
-    96:97:int getNumber():357:357 -> a
-    96:97:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487 -> a
-    98:130:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):431:463 -> a
-    98:130:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):486 -> a
-    131:140:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):490:499 -> a
-    141:142:int getNumber():357:357 -> a
-    141:142:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):500 -> a
-    143:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):386:421 -> a
-    143:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):500 -> a
-    179:195:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):410:426 -> a
-    179:195:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):500 -> a
-    196:197:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):506:507 -> a
-    198:198:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):514:514 -> a
-    199:200:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():854:854 -> a
-    199:200:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):514 -> a
-    201:207:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):518:524 -> a
-    208:208:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):579:579 -> a
+    42:62:void print(com.android.tools.r8.utils.CfgPrinter):332 -> a
+    63:74:void print(com.android.tools.r8.utils.CfgPrinter):334:345 -> a
+    75:76:void setNumber(int):360:361 -> a
+    77:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:475 -> a
+    87:88:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):374:375 -> a
+    87:88:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):472 -> a
+    89:89:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):478:478 -> a
+    90:93:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):101:104 -> a
+    90:93:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):478 -> a
+    94:95:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481:482 -> a
+    96:97:int getNumber():356:356 -> a
+    96:97:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):486 -> a
+    98:130:boolean identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):430:462 -> a
+    98:130:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):485 -> a
+    131:140:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):489:498 -> a
+    141:142:int getNumber():356:356 -> a
+    141:142:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):499 -> a
+    143:178:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):385:420 -> a
+    143:178:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):499 -> a
+    179:195:boolean identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):409:425 -> a
+    179:195:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):499 -> a
+    196:197:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):505:506 -> a
+    198:198:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):513:513 -> a
+    199:200:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():881:881 -> a
+    199:200:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):513 -> a
+    201:207:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):517:523 -> a
+    208:208:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):579:579 -> a
     209:209:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):597:597 -> a
-    210:211:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1386:1387 -> a
-    212:215:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1393:1396 -> a
-    216:218:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1401:1403 -> a
-    219:225:boolean verifyValidPositionInfo(boolean):1471:1477 -> a
-    226:226:boolean verifyValidPositionInfo(boolean):1473:1473 -> a
-    com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> a0
-    boolean isArithmeticBinop() -> a1
-    boolean isInvokeVirtual() -> a2
+    210:211:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1370:1371 -> a
+    212:215:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1377:1380 -> a
+    216:218:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):1385:1387 -> a
+    219:225:boolean verifyValidPositionInfo(boolean):1455:1461 -> a
+    226:226:boolean verifyValidPositionInfo(boolean):1457:1457 -> a
+    com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> a0
+    boolean isArrayGet() -> a1
+    boolean isLoad() -> a2
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
-    1:4:void addInValue(com.android.tools.r8.ir.code.Value):99:102 -> b
-    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):185:188 -> b
-    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):353:353 -> b
-    10:10:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):590:590 -> b
+    1:4:void addInValue(com.android.tools.r8.ir.code.Value):97:100 -> b
+    5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):184:187 -> b
+    9:9:void printLIR(com.android.tools.r8.utils.CfgPrinter):352:352 -> b
+    10:10:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> b
     11:11:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():647:647 -> b
-    12:23:boolean verifyTypes(com.android.tools.r8.graph.AppView):1408:1419 -> b
-    com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> b0
-    boolean isArrayAccess() -> b1
-    boolean isJumpInstruction() -> b2
+    12:23:boolean verifyTypes(com.android.tools.r8.graph.AppView):1392:1403 -> b
+    com.android.tools.r8.ir.code.Load asLoad() -> b0
+    boolean isArrayLength() -> b1
+    boolean isLogicalBinop() -> b2
     com.android.tools.r8.ir.code.Instruction asInstruction() -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
-    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):216:222 -> c
-    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> c
-    com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> c0
-    boolean isArrayGet() -> c1
-    boolean isLoad() -> c2
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():149:150 -> d
-    3:11:void removeDebugValue(com.android.tools.r8.ir.code.Value):232:240 -> d
-    com.android.tools.r8.ir.code.Load asLoad() -> d0
-    boolean isArrayLength() -> d1
-    boolean isLogicalBinop() -> d2
-    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):125:128 -> e
-    5:5:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):536:536 -> e
-    com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> e0
-    boolean isArrayPut() -> e1
-    boolean isMonitor() -> e2
-    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):133:137 -> f
-    6:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):605:609 -> f
-    com.android.tools.r8.ir.code.Monitor asMonitor() -> f0
-    boolean isAssume() -> f1
-    boolean isMonitorEnter() -> f2
-    com.android.tools.r8.ir.code.Move asMove() -> g0
-    boolean isAssumeDynamicType() -> g1
-    boolean isMove() -> g2
-    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():272:273 -> h
-    com.android.tools.r8.ir.code.MoveException asMoveException() -> h0
-    boolean isAssumeNonNull() -> h1
-    boolean isMoveException() -> h2
+    1:7:void moveDebugValues(com.android.tools.r8.ir.code.Instruction):215:221 -> c
+    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> c
+    com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
+    boolean isArrayPut() -> c1
+    boolean isMonitor() -> c2
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():148:149 -> d
+    3:11:void removeDebugValue(com.android.tools.r8.ir.code.Value):231:239 -> d
+    com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
+    boolean isAssume() -> d1
+    boolean isMonitorEnter() -> d2
+    1:4:void setOutValue(com.android.tools.r8.ir.code.Value):123:126 -> e
+    5:5:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):536:536 -> e
+    com.android.tools.r8.ir.code.Move asMove() -> e0
+    boolean isAssumeDynamicType() -> e1
+    boolean isMove() -> e2
+    1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):131:135 -> f
+    6:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):605:609 -> f
+    com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
+    boolean isAssumeNonNull() -> f1
+    boolean isMoveException() -> f2
+    com.android.tools.r8.ir.code.Mul asMul() -> g0
+    boolean isBinop() -> g1
+    boolean isMul() -> g2
+    1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():271:272 -> h
+    com.android.tools.r8.ir.code.Neg asNeg() -> h0
+    boolean isCheckCast() -> h1
+    boolean isNeg() -> h2
     com.android.tools.r8.ir.code.Add asAdd() -> i
-    com.android.tools.r8.ir.code.Mul asMul() -> i0
-    boolean isBinop() -> i1
-    boolean isMul() -> i2
+    com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
+    boolean isCmp() -> i1
+    boolean isNewArrayEmpty() -> i2
     com.android.tools.r8.ir.code.And asAnd() -> j
-    com.android.tools.r8.ir.code.Neg asNeg() -> j0
-    boolean isCheckCast() -> j1
-    boolean isNeg() -> j2
+    com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
+    boolean isConstClass() -> j1
+    boolean isNewArrayFilledData() -> j2
     com.android.tools.r8.ir.code.Argument asArgument() -> k
-    com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> k0
-    boolean isCmp() -> k1
-    boolean isNewArrayEmpty() -> k2
+    com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
+    boolean isConstInstruction() -> k1
+    boolean isNewInstance() -> k2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> l
-    com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> l0
-    boolean isConstClass() -> l1
-    boolean isNewArrayFilledData() -> l2
+    com.android.tools.r8.ir.code.Not asNot() -> l0
+    boolean isConstMethodHandle() -> l1
+    boolean isNot() -> l2
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> m
-    com.android.tools.r8.ir.code.NewInstance asNewInstance() -> m0
-    boolean isConstInstruction() -> m1
-    boolean isNewInstance() -> m2
+    com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
+    boolean isConstMethodType() -> m1
+    boolean isNumberConversion() -> m2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> n
-    com.android.tools.r8.ir.code.Not asNot() -> n0
-    boolean isConstMethodHandle() -> n1
-    boolean isNot() -> n2
+    com.android.tools.r8.ir.code.Or asOr() -> n0
+    boolean isConstNumber() -> n1
+    boolean isOr() -> n2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> o
-    com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> o0
-    boolean isConstMethodType() -> o1
-    boolean isNumberConversion() -> o2
+    com.android.tools.r8.ir.code.Rem asRem() -> o0
+    boolean isConstString() -> o1
+    boolean isOutConstant() -> o2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> p
-    com.android.tools.r8.ir.code.Or asOr() -> p0
-    boolean isConstNumber() -> p1
-    boolean isOr() -> p2
+    com.android.tools.r8.ir.code.Return asReturn() -> p0
+    1:4:boolean isCreatingArray():1349:1352 -> p1
+    boolean isPop() -> p2
     com.android.tools.r8.ir.code.Assume asAssume() -> q
-    com.android.tools.r8.ir.code.Rem asRem() -> q0
-    boolean isConstString() -> q1
-    boolean isOutConstant() -> q2
-    com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> r
-    com.android.tools.r8.ir.code.Return asReturn() -> r0
-    1:4:boolean isCreatingArray():1365:1368 -> r1
-    boolean isPop() -> r2
-    com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> s
-    com.android.tools.r8.ir.code.Shl asShl() -> s0
-    1:1:boolean isCreatingInstanceOrArray():1372:1372 -> s1
-    boolean isRem() -> s2
-    com.android.tools.r8.ir.code.Binop asBinop() -> t
-    com.android.tools.r8.ir.code.Shr asShr() -> t0
-    1:5:boolean isDebugInstruction():1169:1173 -> t1
-    boolean isReturn() -> t2
-    1:14:java.lang.String toString():313:326 -> toString
-    com.android.tools.r8.ir.code.CheckCast asCheckCast() -> u
-    com.android.tools.r8.ir.code.StaticGet asStaticGet() -> u0
-    boolean isDebugLocalRead() -> u1
-    boolean isShl() -> u2
-    com.android.tools.r8.ir.code.Cmp asCmp() -> v
-    com.android.tools.r8.ir.code.StaticPut asStaticPut() -> v0
-    boolean isDebugLocalUninitialized() -> v1
-    boolean isShr() -> v2
-    com.android.tools.r8.ir.code.ConstClass asConstClass() -> w
-    com.android.tools.r8.ir.code.Store asStore() -> w0
-    boolean isDebugLocalWrite() -> w1
-    boolean isStaticFieldInstruction() -> w2
-    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> x
-    com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> x0
-    boolean isDebugLocalsChange() -> x1
-    boolean isStaticGet() -> x2
-    com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> y
-    com.android.tools.r8.ir.code.Sub asSub() -> y0
-    boolean isDebugPosition() -> y1
-    boolean isStaticPut() -> y2
-    com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> z
-    com.android.tools.r8.ir.code.Switch asSwitch() -> z0
-    boolean isDexItemBasedConstString() -> z1
-    boolean isStore() -> z2
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.t.b.k0$a:
+    com.android.tools.r8.ir.code.Shl asShl() -> q0
+    1:1:boolean isCreatingInstanceOrArray():1356:1356 -> q1
+    boolean isRem() -> q2
+    com.android.tools.r8.ir.code.Binop asBinop() -> r
+    com.android.tools.r8.ir.code.Shr asShr() -> r0
+    1:5:boolean isDebugInstruction():1153:1157 -> r1
+    boolean isReturn() -> r2
+    com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
+    com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
+    boolean isDebugLocalRead() -> s1
+    boolean isShl() -> s2
+    com.android.tools.r8.ir.code.Cmp asCmp() -> t
+    com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
+    boolean isDebugLocalUninitialized() -> t1
+    boolean isShr() -> t2
+    1:14:java.lang.String toString():312:325 -> toString
+    com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
+    com.android.tools.r8.ir.code.Store asStore() -> u0
+    boolean isDebugLocalWrite() -> u1
+    boolean isStaticFieldInstruction() -> u2
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
+    com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
+    boolean isDebugLocalsChange() -> v1
+    boolean isStaticGet() -> v2
+    com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
+    com.android.tools.r8.ir.code.Sub asSub() -> w0
+    boolean isDebugPosition() -> w1
+    boolean isStaticPut() -> w2
+    com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
+    com.android.tools.r8.ir.code.Switch asSwitch() -> x0
+    boolean isDexItemBasedConstString() -> x1
+    boolean isStore() -> x2
+    com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
+    com.android.tools.r8.ir.code.Throw asThrow() -> y0
+    boolean isDiv() -> y1
+    boolean isStringSwitch() -> y2
+    com.android.tools.r8.ir.code.ConstString asConstString() -> z
+    com.android.tools.r8.ir.code.Ushr asUshr() -> z0
+    boolean isDup() -> z1
+    boolean isSub() -> z2
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.s.b.k0$a:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption RECEIVER_NOT_NULL -> c
-    1:3:void <clinit>():1486:1488 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1485:1485 -> <init>
-    1:1:boolean canAssumeReceiverIsNotNull():1495:1495 -> a
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.t.b.l0:
+    1:3:void <clinit>():1470:1472 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1469:1469 -> <init>
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.s.b.l0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> d
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> h
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.t.b.m0:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.s.b.m0:
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> a
@@ -26380,65 +26613,65 @@
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
     void removeOrReplaceByDebugLocalRead() -> g
     1:1:void removeInstructionIgnoreOutValue():52:52 -> j
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.t.b.n0:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.s.b.n0:
     boolean isPhi() -> a
     com.android.tools.r8.ir.code.Instruction asInstruction() -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> g
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.t.b.o0:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.s.b.o0:
     boolean $assertionsDisabled -> m
     int[] keys -> l
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):33:35 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    boolean isIntSwitch() -> N1
-    com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> P
-    1:7:boolean valid():61:67 -> S2
-    1:1:int getFirstKey():183:183 -> U2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> V2
-    3:3:int getKey(int):212:212 -> V2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> V2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> V2
-    1:1:int[] getKeys():216:216 -> W2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):49:49 -> a
-    2:2:int getKey(int):212:212 -> a
-    2:2:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50 -> a
-    3:3:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50:50 -> a
-    4:4:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    5:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    5:5:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    6:6:long numberOfTargetsIfPacked(int[]):74:74 -> a
-    7:7:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):85:85 -> a
-    8:8:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    8:8:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
-    9:9:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    boolean isIntSwitch() -> L1
+    com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> N
+    1:7:boolean valid():61:67 -> Q2
+    1:1:int getFirstKey():183:183 -> S2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():220:221 -> T2
+    3:3:int getKey(int):212:212 -> T2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> T2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> T2
+    1:1:int[] getKeys():216:216 -> U2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
+    2:2:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):49:49 -> a
+    3:3:int getKey(int):212:212 -> a
+    3:3:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50 -> a
+    4:4:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50:50 -> a
+    5:5:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
+    6:6:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
+    7:7:long numberOfTargetsIfPacked(int[]):74:74 -> a
+    8:8:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):85:85 -> a
+    9:9:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
     9:9:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
-    10:10:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    10:10:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92 -> a
-    11:11:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93:93 -> a
-    12:12:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> a
-    12:12:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):94 -> a
-    13:13:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):99:99 -> a
-    14:14:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
-    14:14:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    15:15:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
-    15:15:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
+    10:10:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> a
+    10:10:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):90 -> a
+    11:11:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    11:11:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):92 -> a
+    12:12:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):93:93 -> a
+    13:13:int basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> a
+    13:13:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):94 -> a
+    14:14:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode,int[]):99:99 -> a
+    15:15:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):165:165 -> a
     15:15:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    16:16:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
+    16:16:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,int[]):79:79 -> a
+    16:16:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode):165 -> a
     16:16:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    17:17:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
+    17:17:long packedPayloadSize(com.android.tools.r8.utils.InternalOutputMode):170:170 -> a
     17:17:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    18:18:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
-    18:18:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    18:18:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175:175 -> a
     18:18:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
-    19:23:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):203:207 -> a
-    24:50:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):228:254 -> a
-    51:54:void print(com.android.tools.r8.utils.CfgPrinter):284:287 -> a
-    55:55:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):293:293 -> a
-    56:77:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):298:319 -> a
+    19:19:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode,int[]):149:149 -> a
+    19:19:long sparsePayloadSize(com.android.tools.r8.utils.InternalOutputMode):175 -> a
+    19:19:boolean emitPacked(com.android.tools.r8.utils.InternalOutputMode):179 -> a
+    20:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):203:207 -> a
+    25:51:com.android.tools.r8.code.Nop buildPayload(int[],int,com.android.tools.r8.utils.InternalOutputMode):228:254 -> a
+    52:55:void print(com.android.tools.r8.utils.CfgPrinter):284:287 -> a
+    56:56:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):293:293 -> a
+    57:78:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):298:319 -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> b
     1:1:long estimatedSparseSize(com.android.tools.r8.utils.InternalOutputMode,long):103:103 -> b
     2:2:int baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> b
@@ -26454,97 +26687,97 @@
     5:5:int getKey(int):212:212 -> toString
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.t.b.p0:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.s.b.p0:
     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>
-    1:1:java.lang.String getInstructionName():276:276 -> H0
-    1:1:java.util.List arguments():103:103 -> I2
-    1:1:int maxInValueRegister():220 -> I2
-    2:4:int maxInValueRegister():220:222 -> I2
-    int maxOutValueRegister() -> J2
-    boolean isInvoke() -> O1
-    1:1:java.util.List arguments():103:103 -> O2
-    1:1:java.util.List arguments():103:103 -> P2
-    1:1:boolean argumentsAreConsecutiveInputArguments():229 -> P2
-    2:2:boolean argumentsAreConsecutiveInputArguments():229:229 -> P2
-    3:3:java.util.List arguments():103:103 -> P2
-    3:3:boolean argumentsAreConsecutiveInputArguments():232 -> P2
-    4:5:boolean argumentsAreConsecutiveInputArguments():232:233 -> P2
-    6:6:java.util.List arguments():103:103 -> P2
-    6:6:boolean argumentsAreConsecutiveInputArguments():236 -> P2
-    7:7:boolean argumentsAreConsecutiveInputArguments():236:236 -> P2
-    8:8:java.util.List arguments():103:103 -> P2
-    8:8:boolean argumentsAreConsecutiveInputArguments():237 -> P2
-    9:10:boolean argumentsAreConsecutiveInputArguments():237:238 -> P2
-    com.android.tools.r8.ir.code.Invoke asInvoke() -> Q
-    com.android.tools.r8.graph.DexType getReturnType() -> Q2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> R2
-    java.lang.String getTypeString() -> S2
-    1:1:int requiredArgumentRegisters():112:112 -> T2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> T2
-    2:2:int requiredArgumentRegisters():113 -> T2
-    boolean instructionTypeCanThrow() -> V0
-    1:21: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,boolean):71:91 -> a
-    22:22: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,boolean):89:89 -> a
-    23:23: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,boolean):87:87 -> a
-    24:24: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,boolean):85:85 -> a
-    25:25: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,boolean):83:83 -> a
-    26:26: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,boolean):79:79 -> a
-    27:27: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,boolean):75:75 -> a
-    28:36: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,boolean):73:81 -> a
-    37:37: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,boolean):77:77 -> a
-    38:38:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):119:119 -> a
-    39:39:java.util.List arguments():103:103 -> a
-    39:39:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):120 -> a
-    40:40:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):120:120 -> a
-    41:41:java.util.List arguments():103:103 -> a
-    41:41:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):126 -> a
-    42:42:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):126:126 -> a
-    43:43:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):132:132 -> a
-    44:44:java.util.List arguments():103:103 -> a
-    44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):134 -> a
-    45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):134:143 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> a
-    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
-    56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:147 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> a
-    59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):147 -> a
-    60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):147:147 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> a
-    61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):148 -> a
-    62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):149:150 -> a
-    64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):169:182 -> a
-    78:82:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):180:184 -> a
-    83:99:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):190:206 -> a
-    100:106:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):204:210 -> a
-    107:111:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):291:295 -> a
-    112:112:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):293:293 -> a
-    113:113:boolean outTypeKnownToBeBoolean(java.util.Set):300:300 -> a
-    1:1:java.util.List arguments():103:103 -> b
-    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):157 -> b
-    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):157:158 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> b
-    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
-    5:5:java.util.List arguments():103:103 -> b
-    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):159 -> b
-    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):159:159 -> b
-    7:7:java.util.List arguments():103:103 -> b
-    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):160 -> b
-    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):160:161 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():311:311 -> b
-    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):162 -> b
-    11:11:java.util.List arguments():103:103 -> b
-    11:11:com.android.tools.r8.ir.code.Value getArgument(int):107 -> b
-    12:12:com.android.tools.r8.ir.code.Value getArgument(int):107:107 -> b
-    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):247:247 -> c
-    2:2:java.util.List arguments():103:103 -> c
-    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):254 -> c
-    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):254:261 -> c
-    11:11:java.util.List arguments():103:103 -> c
-    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):262 -> c
-    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):262:263 -> c
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.t.b.p0$a:
+    1:1:java.lang.String getInstructionName():277:277 -> F0
+    1:1:java.util.List arguments():104:104 -> G2
+    1:1:int maxInValueRegister():221 -> G2
+    2:4:int maxInValueRegister():221:223 -> G2
+    int maxOutValueRegister() -> H2
+    boolean isInvoke() -> M1
+    1:1:java.util.List arguments():104:104 -> M2
+    1:1:java.util.List arguments():104:104 -> N2
+    1:1:boolean argumentsAreConsecutiveInputArguments():230 -> N2
+    2:2:boolean argumentsAreConsecutiveInputArguments():230:230 -> N2
+    3:3:java.util.List arguments():104:104 -> N2
+    3:3:boolean argumentsAreConsecutiveInputArguments():233 -> N2
+    4:5:boolean argumentsAreConsecutiveInputArguments():233:234 -> N2
+    6:6:java.util.List arguments():104:104 -> N2
+    6:6:boolean argumentsAreConsecutiveInputArguments():237 -> N2
+    7:7:boolean argumentsAreConsecutiveInputArguments():237:237 -> N2
+    8:8:java.util.List arguments():104:104 -> N2
+    8:8:boolean argumentsAreConsecutiveInputArguments():238 -> N2
+    9:10:boolean argumentsAreConsecutiveInputArguments():238:239 -> N2
+    com.android.tools.r8.ir.code.Invoke asInvoke() -> O
+    com.android.tools.r8.graph.DexType getReturnType() -> O2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> P2
+    java.lang.String getTypeString() -> Q2
+    1:1:int requiredArgumentRegisters():113:113 -> R2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> R2
+    2:2:int requiredArgumentRegisters():114 -> R2
+    boolean instructionTypeCanThrow() -> T0
+    1:21: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,boolean):72:92 -> a
+    22:22: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,boolean):90:90 -> a
+    23:23: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,boolean):88:88 -> a
+    24:24: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,boolean):86:86 -> a
+    25:25: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,boolean):84:84 -> a
+    26:26: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,boolean):80:80 -> a
+    27:27: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,boolean):76:76 -> a
+    28:36: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,boolean):74:82 -> a
+    37:37: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,boolean):78:78 -> a
+    38:38:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):120:120 -> a
+    39:39:java.util.List arguments():104:104 -> a
+    39:39:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):121 -> a
+    40:40:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):121:121 -> a
+    41:41:java.util.List arguments():104:104 -> a
+    41:41:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):127 -> a
+    42:42:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):127:127 -> a
+    43:43:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):133:133 -> a
+    44:44:java.util.List arguments():104:104 -> a
+    44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):135 -> a
+    45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):135:144 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> a
+    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145 -> a
+    56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):146:148 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> a
+    59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):148 -> a
+    60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):148:148 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> a
+    61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):149 -> a
+    62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):150:151 -> a
+    64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):170:183 -> a
+    78:82:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):181:185 -> a
+    83:99:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):191:207 -> a
+    100:106:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):205:211 -> a
+    107:111:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):292:296 -> a
+    112:112:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):294:294 -> a
+    113:113:boolean outTypeKnownToBeBoolean(java.util.Set):301:301 -> a
+    1:1:java.util.List arguments():104:104 -> b
+    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
+    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158:159 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> b
+    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):159 -> b
+    5:5:java.util.List arguments():104:104 -> b
+    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):160 -> b
+    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):160:160 -> b
+    7:7:java.util.List arguments():104:104 -> b
+    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):161 -> b
+    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):161:162 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():312:312 -> b
+    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):163 -> b
+    11:11:java.util.List arguments():104:104 -> b
+    11:11:com.android.tools.r8.ir.code.Value getArgument(int):108 -> b
+    12:12:com.android.tools.r8.ir.code.Value getArgument(int):108:108 -> b
+    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):248:248 -> c
+    2:2:java.util.List arguments():104:104 -> c
+    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
+    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:262 -> c
+    11:11:java.util.List arguments():104:104 -> c
+    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):263 -> c
+    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):263:264 -> c
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.s.b.p0$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
@@ -26564,382 +26797,422 @@
     20:23:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
     24:24:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:42 -> a
     25:25: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.t.b.q0:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.s.b.q0:
     com.android.tools.r8.graph.DexCallSite callSite -> i
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):30:32 -> <init>
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    boolean isInvokeCustom() -> P1
-    1:1:com.android.tools.r8.graph.DexType getReturnType():100:100 -> Q2
-    com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> R
-    java.lang.String getTypeString() -> S2
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> U2
-    1:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():0:172 -> a
-    1:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):169 -> a
-    174:200:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):65:91 -> a
-    201:212:boolean verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeElement,java.util.Set,com.android.tools.r8.graph.DexType):47:58 -> a
-    201:212:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):93 -> a
-    213:213:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):95:95 -> a
-    214:214:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    214:214:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):195 -> a
-    215:215:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):195:195 -> a
-    216:221:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):125:130 -> a
-    222:222:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    222:222:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):130 -> a
-    223:227:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):130:134 -> a
-    228:228:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    228:228:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):136 -> a
-    229:236:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):136:143 -> a
-    237:237:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):148:148 -> a
-    238:238:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    238:238:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):148 -> a
-    239:239:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):148:148 -> a
-    240:240:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):176:176 -> a
-    241:241:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    241:241:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177 -> a
-    242:245:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:180 -> a
-    246:246:com.android.tools.r8.graph.DexCallSite getCallSite():104:104 -> a
-    246:246:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):181 -> a
-    247:250:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):181:184 -> a
-    251:251:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
-    251:251:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):153:153 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:1:java.lang.String toString():119:119 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.t.b.r0:
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    boolean isInvokeCustom() -> N1
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> O2
+    com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> P
+    java.lang.String getTypeString() -> Q2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> S2
+    1:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():0:170 -> a
+    1:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):170 -> a
+    172:198:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):66:92 -> a
+    199:210:boolean verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeElement,java.util.Set,com.android.tools.r8.graph.DexType):48:59 -> a
+    199:210:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
+    211:211:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):96:96 -> a
+    212:212:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    212:212:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196 -> a
+    213:213:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):196:196 -> a
+    214:219:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):126:131 -> a
+    220:220:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    220:220:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131 -> a
+    221:225:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):131:135 -> a
+    226:226:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    226:226:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137 -> a
+    227:234:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):137:144 -> a
+    235:235:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
+    236:236:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    236:236:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149 -> a
+    237:237:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
+    238:238:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):177:177 -> a
+    239:239:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    239:239:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178 -> a
+    240:243:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):178:181 -> a
+    244:244:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> a
+    244:244:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182 -> a
+    245:248:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):182:185 -> a
+    249:249:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeCustom):184:184 -> a
+    249:249:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):154:154 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:java.lang.String toString():120:120 -> toString
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.s.b.r0:
     boolean $assertionsDisabled -> m
-    boolean itf -> l
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:44 -> <init>
-    int opcode() -> K2
-    boolean isInvokeDirect() -> Q1
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():64:64 -> R2
-    com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> S
-    java.lang.String getTypeString() -> S2
-    1:1:boolean isInterface():54:54 -> W2
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:93 -> 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):141:141 -> a
-    21:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):146:146 -> a
-    22:22:boolean definitelyTriggersClassInitialization(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):156:156 -> a
-    23:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):163:193 -> a
-    54:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):192:198 -> a
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    61:61:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):198 -> a
-    62:77:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):200:215 -> a
-    78:78:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):189:189 -> a
-    78:78:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59 -> a
-    79:80:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220:221 -> a
-    81:81:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    81:81:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):221 -> a
-    82:96:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225:239 -> a
-    97:97:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    97:97:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):239 -> a
-    98:116:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):243:261 -> a
-    117:117:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):255:255 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):110:110 -> b
-    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):271:284 -> f
-    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125:130 -> g
-    7:13:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:135 -> g
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.t.b.s0:
+    boolean isInterface -> l
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):39:42 -> <init>
+    int opcode() -> I2
+    boolean isInvokeDirect() -> O1
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():63:63 -> P2
+    com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> Q
+    java.lang.String getTypeString() -> Q2
+    1:1:boolean getInterfaceBit():53:53 -> S2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:92 -> a
+    20:25:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):128:133 -> a
+    26:32:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):132:138 -> a
+    33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):144:144 -> a
+    34:36:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
+    37:37:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
+    38:38:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):166:166 -> a
+    39:39:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    39:39:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):167 -> a
+    40:52:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):171:183 -> a
+    53:53:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    53:53:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):185 -> a
+    54:72:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189:207 -> a
+    73:73:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):189:189 -> a
+    73:73:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):58 -> a
+    74:74:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):201:201 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):109:109 -> b
+    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):217:230 -> f
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.s.b.s0:
     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>
-    int opcode() -> K2
-    boolean isInvokeInterface() -> R1
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():41:41 -> R2
-    java.lang.String getTypeString() -> S2
-    com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> T
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:70 -> 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):108:108 -> a
-    21:21:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):113:113 -> a
-    22:22:boolean definitelyTriggersClassInitialization(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):123:123 -> a
-    23:23:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):194:194 -> a
-    23:23:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
-    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:95 -> g
-    7:167:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):0:160 -> g
-    7:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99 -> g
-    168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:100 -> g
-    169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):94:94 -> g
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.t.b.t0:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
+    int opcode() -> I2
+    boolean isInvokeInterface() -> P1
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():50:50 -> P2
+    java.lang.String getTypeString() -> Q2
+    com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> R
+    boolean getInterfaceBit() -> S2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:79 -> a
+    20:30:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):103:113 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):112:112 -> a
+    32:32:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):107:107 -> a
+    33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):122:122 -> a
+    34:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:127 -> a
+    35:35:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):137:137 -> a
+    36:36:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):194:194 -> a
+    36:36:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):84:84 -> b
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.s.b.t0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):43:44 -> <init>
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> Q2
-    boolean isInvokeMethod() -> S1
-    com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> U
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():53:53 -> U2
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:41 -> <init>
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.graph.DexType getReturnType():48:48 -> O2
+    boolean isInvokeMethod() -> Q1
+    com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> S
+    boolean getInterfaceBit() -> S2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():52:52 -> T2
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-    void lambda$lookupTargets$1(com.android.tools.r8.graph.LookupLambdaTarget) -> a
-    1:2:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):83:84 -> a
-    3:3:void lambda$lookupTargets$0(java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
-    4:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):152:157 -> a
-    10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162:162 -> a
-    12:12:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    12:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):163 -> a
-    13:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):163:164 -> a
-    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):164 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):164:164 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):175:183 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):194:194 -> a
-    27:32:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):209:214 -> a
-    33:33:boolean verifyD8LookupResult(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):222:222 -> a
-    34:39:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):228:233 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):58:58 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:204 -> f
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> g
-    1:5:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:94 -> h
-    6:7:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> h
-    6:7:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95 -> h
-    8:8:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:100 -> h
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> h
-    9:9:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99 -> h
-    10:18:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):98:106 -> h
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> h
-    19:19:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106 -> h
-    20:36:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):106:122 -> h
-    37:46:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:129 -> h
-    47:55:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):127:135 -> h
-    1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.t.b.u0:
+    void lambda$lookupProgramDispatchTargets$1(com.android.tools.r8.graph.LookupLambdaTarget) -> a
+    1:2:void lambda$lookupProgramDispatchTargets$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):134:135 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):153:158 -> a
+    9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):163 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):163:163 -> a
+    11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):164 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):164:165 -> a
+    14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):165 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):165:165 -> a
+    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):176:184 -> a
+    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):195:195 -> a
+    26:31:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):211:216 -> a
+    32:32:boolean verifyD8LookupResult(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):224:224 -> a
+    33:38:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):230:235 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):57:57 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):205:205 -> f
+    1:4:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):88:91 -> g
+    5:6:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):81:82 -> g
+    5:6:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):92 -> g
+    7:8:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):41:42 -> g
+    7:8:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):93 -> g
+    9:9:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:98 -> g
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> g
+    10:10:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97 -> g
+    11:19:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):96:104 -> g
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> g
+    20:20:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104 -> g
+    21:37:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104:120 -> g
+    38:46:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):118:126 -> g
+    47:54:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):125:132 -> g
+    1:2:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):81:82 -> h
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
+    1:1:java.lang.String toString():62:62 -> toString
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.s.b.u0:
     boolean $assertionsDisabled -> k
-    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>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():67:67 -> I0
-    boolean throwsOnNullInput() -> N2
-    boolean isInvokeMethodWithReceiver() -> U1
-    com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> V
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():40:41 -> V2
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):51:51 -> a
-    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):57:57 -> a
-    1:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):72:81 -> b
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():114:114 -> G0
+    boolean throwsOnNullInput() -> L2
+    boolean isInvokeMethodWithReceiver() -> S1
+    com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> T
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():59:60 -> U2
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):70:70 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
+    3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):182:187 -> a
+    9:1488:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeReceiverIsNotNull():0:1479 -> a
+    9:1488:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):188 -> a
+    1489:1520:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):188:219 -> a
+    1521:1521:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.ResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):67:67 -> a
+    1521:1521:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):219 -> a
+    1522:1545:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220:243 -> a
+    1546:1546:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):248:248 -> a
+    1547:1547:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    1547:1547:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):248 -> a
+    1:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):119:128 -> b
     11:171:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):0:160 -> b
-    11:171:boolean verifyTypes(com.android.tools.r8.graph.AppView):84 -> b
-    172:176:boolean verifyTypes(com.android.tools.r8.graph.AppView):85:89 -> b
-    177:200:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102:125 -> b
-    177:200:boolean verifyTypes(com.android.tools.r8.graph.AppView):88 -> b
-    201:201:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    201:201:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128 -> b
-    201:201:boolean verifyTypes(com.android.tools.r8.graph.AppView):88 -> b
-    202:202:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:129 -> b
-    202:202:boolean verifyTypes(com.android.tools.r8.graph.AppView):88 -> b
-    203:203:boolean verifyTypes(com.android.tools.r8.graph.AppView):85:85 -> b
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.t.b.v0:
+    11:171:boolean verifyTypes(com.android.tools.r8.graph.AppView):131 -> b
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):165:165 -> b
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):160 -> b
+    172:172:boolean verifyTypes(com.android.tools.r8.graph.AppView):131 -> b
+    173:177:boolean verifyTypes(com.android.tools.r8.graph.AppView):132:136 -> b
+    178:201:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):149:172 -> b
+    178:201:boolean verifyTypes(com.android.tools.r8.graph.AppView):135 -> b
+    202:202:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    202:202:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> b
+    202:202:boolean verifyTypes(com.android.tools.r8.graph.AppView):135 -> b
+    203:203:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> b
+    203:203:boolean verifyTypes(com.android.tools.r8.graph.AppView):135 -> b
+    204:204:boolean verifyTypes(com.android.tools.r8.graph.AppView):132:132 -> b
+    1:2:boolean hasRefinedReceiverLowerBoundType(com.android.tools.r8.graph.AppView):37:38 -> c
+    1:2:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):42:43 -> d
+    3:163:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):0:160 -> d
+    3:163:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):44 -> d
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):165:165 -> d
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.analysis.type.TypeAnalysis.getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):160 -> d
+    164:164:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):44 -> d
+    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):78:83 -> i
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.s.b.v0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> Q2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> Q2
-    java.lang.String getTypeString() -> S2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> U2
-    boolean isInvokeMultiNewArray() -> V1
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> V2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> V2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> V2
-    com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> W
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):81:81 -> a
-    2:2:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):86:86 -> a
-    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):96:96 -> a
-    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):101:102 -> a
-    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):107:107 -> a
-    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
-    10:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):177:182 -> a
-    16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> a
-    17:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):177:182 -> a
-    17:22:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    17:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.graph.DexType getArrayType():59:59 -> O2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():64 -> O2
+    java.lang.String getTypeString() -> Q2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():59:59 -> S2
+    boolean isInvokeMultiNewArray() -> T1
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> T2
+    1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():158 -> T2
+    2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():158:164 -> T2
+    com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> U
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):80:80 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):85:85 -> a
+    3:3:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):95:95 -> a
+    4:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):100:101 -> a
+    6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
+    7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():104:104 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:106 -> a
+    9:9:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):111:111 -> a
+    10:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):176:181 -> a
+    16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186:186 -> a
+    17:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):176:181 -> a
+    17:22:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    17:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):186 -> a
     23:23:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeMultiNewArray):199:199 -> a
-    23:23:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
-    2:19:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:134 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    20:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):138 -> b
-    21:35:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:154 -> b
-    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.t.b.w0:
+    23:23:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):74:74 -> b
+    2:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):116:130 -> b
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    17:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> b
+    18:19:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142:143 -> b
+    20:20:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView) -> b
+    20:20:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):148 -> b
+    21:21:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> b
+    21:21:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):148 -> b
+    22:27:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):148:153 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.s.b.w0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> Q2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> Q2
-    java.lang.String getTypeString() -> S2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> U2
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> V2
-    boolean isInvokeNewArray() -> W1
-    com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> X
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> 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):110:110 -> a
-    21:21:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):125:125 -> a
-    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):130:130 -> a
-    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
-    25:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):190:195 -> a
-    31:31:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):200:200 -> a
-    32:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):190:195 -> a
-    32:37:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    32:37:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):200 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.graph.DexType getArrayType():49:49 -> O2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():45 -> O2
+    java.lang.String getTypeString() -> Q2
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():138:138 -> S2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():49:49 -> T2
+    boolean isInvokeNewArray() -> U1
+    com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> V
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):109:109 -> a
+    21:21:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):114:114 -> a
+    22:22:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):124:124 -> a
+    23:23:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):129:129 -> a
+    24:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
+    25:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):189:194 -> a
+    31:31:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
+    32:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):189:194 -> a
+    32:37:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    32:37:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199 -> a
     38:38:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeNewArray):204:204 -> a
-    38:38:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
-    2:19:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:161 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    20:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165 -> b
-    21:37:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167:183 -> b
-    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.t.b.x0:
+    38:38:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> b
+    2:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):143:157 -> b
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    17:17:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):164 -> b
+    18:19:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):169:170 -> b
+    20:20:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView) -> b
+    20:20:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):176 -> b
+    21:21:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> b
+    21:21:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):176 -> b
+    22:22:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):176:176 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    1:1:java.lang.String toString():64:64 -> toString
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.s.b.x0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):34:35 -> <init>
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():50:50 -> Q2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> R2
-    java.lang.String getTypeString() -> S2
-    1:1:com.android.tools.r8.graph.DexProto getProto():64:64 -> V2
-    boolean isInvokePolymorphic() -> X1
-    com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> Y
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:76 -> a
-    8:8:com.android.tools.r8.graph.DexProto getProto():64:64 -> a
-    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76 -> a
-    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:82 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto():64:64 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83 -> a
-    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:90 -> a
-    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):95:101 -> a
-    32:32:com.android.tools.r8.graph.DexProto getProto():64:64 -> a
-    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101 -> a
-    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):101:102 -> a
-    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138:138 -> a
-    36:271:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):0:235 -> a
-    36:271:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):138 -> a
-    272:274:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):150:152 -> a
-    275:275:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):209:209 -> a
-    275:275:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45 -> a
-    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):107:109 -> b
-    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> g
-    java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> h
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.t.b.y0:
-    boolean itf -> k
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():55:55 -> O2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():60:60 -> P2
+    java.lang.String getTypeString() -> Q2
+    boolean getInterfaceBit() -> S2
+    1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> U2
+    boolean isInvokePolymorphic() -> V1
+    com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> W
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:81 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():69:69 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:87 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():69:69 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:95 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:106 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():69:69 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):106:107 -> a
+    35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):143:143 -> a
+    36:262:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):0:226 -> a
+    36:262:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):143 -> a
+    263:265:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):155:157 -> a
+    266:266:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokePolymorphic):209:209 -> a
+    266:266:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):50 -> a
+    1:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):112:114 -> b
+    com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> g
+    com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.s.b.y0:
+    boolean isInterface -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):37:38 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:43 -> <init>
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():58:58 -> R2
-    java.lang.String getTypeString() -> S2
-    boolean isInvokeStatic() -> Y1
-    com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Z
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:87 -> 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):129:129 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):139:139 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    23:23:boolean definitelyTriggersClassInitialization(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):155:155 -> a
-    24:49:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):162:187 -> a
-    50:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):186:196 -> a
-    61:61:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeClassIsAlreadyInitialized():1491:1491 -> a
-    61:61:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):200 -> a
-    62:68:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):205:211 -> a
-    69:69:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):206:206 -> a
-    70:70:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> a
-    71:71:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
-    71:71:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):53 -> a
-    72:72:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219:219 -> a
-    73:73:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    73:73:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107:112 -> g
-    7:12:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):111:116 -> g
-    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> g
-    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):116 -> g
-    14:15:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):118:119 -> g
-    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> g
-    16:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119 -> g
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):123:123 -> g
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.t.b.z0:
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):36:37 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):41:42 -> <init>
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():62:62 -> P2
+    java.lang.String getTypeString() -> Q2
+    1:1:boolean getInterfaceBit():47:47 -> S2
+    boolean isInvokeStatic() -> W1
+    com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> X
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:91 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):133:133 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143:143 -> a
+    22:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):149:149 -> a
+    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
+    26:64:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):167:205 -> a
+    65:65:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.ResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):67:67 -> a
+    65:65:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):206 -> a
+    66:71:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):206:211 -> a
+    72:72:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> a
+    72:72:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):211 -> a
+    73:77:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):211:215 -> a
+    78:1553:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canAssumeClassIsAlreadyInitialized():0:1475 -> a
+    78:1553:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):219 -> a
+    1554:1560:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):224:230 -> a
+    1561:1561:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):225:225 -> a
+    1562:1562:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
+    1562:1562:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):57 -> a
+    1563:1563:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):229:229 -> a
+    1564:1564:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235:235 -> a
+    1565:1565:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    1565:1565:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
+    1:6:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):111:116 -> i
+    7:12:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):115:120 -> i
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> i
+    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):120 -> i
+    14:15:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:123 -> i
+    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> i
+    16:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):123 -> i
+    17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):127:127 -> i
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.s.b.z0:
     boolean $assertionsDisabled -> m
-    boolean itf -> l
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):27:28 -> <init>
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> R2
-    java.lang.String getTypeString() -> S2
-    boolean isInvokeSuper() -> Z1
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:72 -> a
-    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:77 -> 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):110:110 -> a
-    22:22:boolean definitelyTriggersClassInitialization(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):120:120 -> a
-    23:23:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):219:219 -> a
-    23:23:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> a0
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> b
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> g
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.t.b.A0:
+    boolean isInterface -> l
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):30:31 -> <init>
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():51:51 -> P2
+    java.lang.String getTypeString() -> Q2
+    1:1:boolean getInterfaceBit():36:36 -> S2
+    boolean isInvokeSuper() -> X1
+    com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> Y
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:80 -> a
+    20:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):85:85 -> a
+    23:27:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):110:114 -> a
+    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):123:123 -> a
+    29:29:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):133:133 -> a
+    30:30:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):219:219 -> a
+    30:30:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> b
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.s.b.A0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):30:30 -> <init>
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():45:45 -> R2
-    java.lang.String getTypeString() -> S2
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:74 -> a
-    20:30:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):99:109 -> a
-    31:42:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):103:114 -> a
-    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):115 -> a
-    44:44:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):117:117 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):118 -> a
-    46:46:boolean com.android.tools.r8.graph.DexClass.isFinal():464:464 -> a
-    46:46:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):119 -> a
-    47:47:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value):119 -> a
-    48:48:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):130:130 -> a
-    49:49:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):135:135 -> a
-    50:50:boolean definitelyTriggersClassInitialization(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):145:145 -> a
-    51:87:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):152:188 -> a
-    88:98:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):187:197 -> a
-    99:99:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):208:208 -> a
-    100:100:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    100:100:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):208 -> a
-    101:101:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):224:224 -> a
-    101:101:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40 -> a
-    boolean isInvokeVirtual() -> a2
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):79:79 -> b
-    com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> b0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):94:94 -> g
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.t.b.B0:
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):31:31 -> <init>
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():51:51 -> P2
+    java.lang.String getTypeString() -> Q2
+    boolean getInterfaceBit() -> S2
+    boolean isInvokeVirtual() -> Y1
+    com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> Z
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:80 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):105:105 -> a
+    21:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):104:104 -> a
+    22:31:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):114:123 -> a
+    32:43:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):118:129 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    44:44:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):130 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):132:132 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    46:46:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):133 -> a
+    47:47:boolean com.android.tools.r8.graph.DexClass.isFinal():469:469 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):134 -> a
+    48:48:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    48:48:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):134 -> a
+    49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):145:145 -> a
+    50:50:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):150:150 -> a
+    51:51:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):160:160 -> a
+    52:52:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):224:224 -> a
+    52:52:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.s.b.B0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> O2
-    boolean hasInvariantOutType() -> P0
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean isJumpInstruction() -> Z1
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:265:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:264 -> a
-    1:265: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:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:252 -> a
+    1:253:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):52 -> a
+    com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> a0
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):31:31 -> b
-    boolean isJumpInstruction() -> b2
-    com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> c0
-    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.t.b.C0:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.s.b.C0:
+    com.android.tools.r8.ir.code.IRCode code -> b
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
+    1:1:java.lang.Object get():9:9 -> a
+    1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> c
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> d
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.s.b.D0:
     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
@@ -26974,30 +27247,30 @@
     1:1:void set(java.lang.Object):17:17 -> set
     2:2:void set(com.android.tools.r8.ir.code.Instruction):201:201 -> set
     2:2:void set(java.lang.Object):17 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.t.b.D0:
-    1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():61:61 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> O2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:269:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():0:268 -> a
-    1:269: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 -> com.android.tools.r8.s.b.E0:
+    1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():62:62 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:257:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():0:256 -> a
+    1:257:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):68 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    270:270:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    271:272:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):77:78 -> a
-    273:273:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):83:83 -> a
-    274:274:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):93:93 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51:51 -> b
-    boolean isLoad() -> c2
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.Load asLoad() -> d0
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.t.b.E0:
+    258:258:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
+    259:259:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:73 -> a
+    260:261:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78:79 -> a
+    262:262:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):84:84 -> a
+    263:263:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94:94 -> a
+    boolean isLoad() -> a2
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> b
+    com.android.tools.r8.ir.code.Load asLoad() -> b0
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.s.b.F0:
     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>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> T2
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> R2
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
     20:47:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:94 -> a
@@ -27007,13 +27280,13 @@
     87:87:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):144:144 -> a
     com.android.tools.r8.code.Instruction CreateInt2Addr(int,int) -> b
     com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int) -> b
+    boolean isLogicalBinop() -> b2
     com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int) -> c
     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.ir.code.LogicalBinop asLogicalBinop() -> c0
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
-    boolean isLogicalBinop() -> d2
-    com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> e0
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.t.b.F0:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.s.b.G0:
     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
@@ -27029,107 +27302,107 @@
     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.t.b.G0:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.s.b.H0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Monitor$Type type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):30:31 -> <init>
-    1:7:java.lang.String getInstructionName():118:124 -> H0
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():155:155 -> I0
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():86:86 -> J2
-    int opcode() -> K2
-    boolean throwsOnNullInput() -> N2
-    1:1:boolean isEnter():49:49 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:273:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():0:272 -> a
-    1:273:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):113 -> a
-    274:281:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:70 -> a
-    282:282:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):135:135 -> a
-    283:283:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):140:140 -> a
-    284:284:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> a
+    1:7:java.lang.String getInstructionName():118:124 -> F0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():155:155 -> G0
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():86:86 -> H2
+    int opcode() -> I2
+    boolean throwsOnNullInput() -> L2
+    1:1:boolean isEnter():49:49 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
+    1:261:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():0:260 -> a
+    1:261:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):113 -> a
+    262:262:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
+    263:270:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:70 -> a
+    271:271:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):135:135 -> a
+    272:272:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):140:140 -> a
+    273:273:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):145:145 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):76:76 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isMonitor() -> e2
+    boolean isMonitor() -> c2
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
+    1:1:boolean isEnter():49:49 -> d2
+    1:1:boolean isMonitorEnter():102 -> d2
     1:1:com.android.tools.r8.ir.code.Value object():45:45 -> f
-    com.android.tools.r8.ir.code.Monitor asMonitor() -> f0
-    1:1:boolean isEnter():49:49 -> f2
-    1:1:boolean isMonitorEnter():102 -> f2
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.t.b.G0$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.s.b.H0$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
     1:1:void <clinit>():24:24 -> <clinit>
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.t.b.H0:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.s.b.I0:
     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>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> K0
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> P2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():0:276 -> a
-    1:277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
-    278:278:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
-    279:279:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:51 -> a
-    280:280:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):56:56 -> a
-    281:281:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
-    282:282:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> I0
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> N2
+    1:265:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():0:264 -> a
+    1:265:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):103 -> a
+    266:266:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):33:33 -> a
+    267:267:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
+    268:268:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):51:51 -> a
+    269:269:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):56:56 -> a
+    270:270:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
+    271:271:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:131 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.Move asMove() -> g0
-    boolean isMove() -> g2
-    1:1:boolean isOutConstant():81:81 -> q2
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.Move asMove() -> e0
+    boolean isMove() -> e2
+    1:1:boolean isOutConstant():81:81 -> o2
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.t.b.I0:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.s.b.J0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:int maxInValueRegister():51:51 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():120:120 -> O2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):25:27 -> <init>
+    1:1:int maxInValueRegister():52:52 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():121:121 -> M2
+    boolean hasInvariantOutType() -> N0
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
-    1:281:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():0:280 -> a
-    1:281:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):91 -> a
-    282:282:com.android.tools.r8.ir.code.Value dest():40:40 -> a
-    282:282:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
-    283:284:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
-    285:287:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:85 -> a
-    288:288:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
-    289:289:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):111:111 -> a
-    290:290:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):116:116 -> a
-    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1528:1528 -> b
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> b
-    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.MoveException asMoveException() -> h0
-    boolean isMoveException() -> h2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.t.b.J0:
+    1:269:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():0:268 -> a
+    1:269:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):92 -> a
+    270:270:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    271:271:com.android.tools.r8.ir.code.Value dest():41:41 -> a
+    271:271:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
+    272:273:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46:47 -> a
+    274:276:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):84:86 -> a
+    277:277:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):97:97 -> a
+    278:278:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):112:112 -> a
+    279:279:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):117:117 -> a
+    1:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:66 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1562:1562 -> b
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66 -> b
+    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
+    boolean isMoveException() -> f2
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.s.b.K0:
     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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> R2
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):32:32 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
     1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):61:61 -> b
     2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):89:89 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
@@ -27140,15 +27413,14 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    com.android.tools.r8.ir.code.Mul asMul() -> i0
-    boolean isMul() -> i2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.t.b.K0:
+    com.android.tools.r8.ir.code.Mul asMul() -> g0
+    boolean isMul() -> g2
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.s.b.L0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    int opcode() -> K2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
     2:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:71 -> a
@@ -27156,139 +27428,144 @@
     20:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:65 -> a
     21:21:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:62 -> a
     22:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:73 -> a
-    37:55:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
-    56:56:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
+    37:37:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
+    57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
-    com.android.tools.r8.ir.code.Neg asNeg() -> j0
-    boolean isNeg() -> j2
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.t.b.L0:
+    com.android.tools.r8.ir.code.Neg asNeg() -> h0
+    boolean isNeg() -> h2
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.s.b.M0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:4:boolean instructionInstanceCanThrow():77:80 -> T0
-    boolean instructionTypeCanThrow() -> V0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
-    3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
-    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):216:216 -> a
-    12:12:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90 -> a
-    13:13: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
-    14:14:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
-    15:16:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):126:127 -> a
-    17:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:133 -> a
-    19:19:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> k0
-    boolean isNewArrayEmpty() -> k2
-    1:1:java.lang.String toString():41:41 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.t.b.M0:
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):26:27 -> <init>
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value size():50:50 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:4:boolean instructionInstanceCanThrow():78:81 -> R0
+    boolean instructionTypeCanThrow() -> T0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:55 -> a
+    3:3:com.android.tools.r8.ir.code.Value dest():46:46 -> a
+    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56 -> a
+    4:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
+    6:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):86:91 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    12:12:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):112:112 -> a
+    14:14:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):122:122 -> a
+    15:16:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):127:128 -> a
+    17:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):133:134 -> a
+    19:19:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):139:139 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
+    boolean isNewArrayEmpty() -> i2
+    1:1:java.lang.String toString():42:42 -> toString
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.s.b.N0:
     long size -> i
     short[] data -> j
     boolean $assertionsDisabled -> k
     int element_width -> h
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):30:33 -> <init>
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():83:83 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> O2
-    boolean hasInvariantOutType() -> P0
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():0:288 -> a
-    1:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
-    290:291:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):56:57 -> a
-    292:292:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):62:62 -> a
-    293:293:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):110:110 -> a
-    294:301:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:142 -> a
-    302:302:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154:154 -> a
-    303:310:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):135:142 -> a
-    303:310:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574 -> a
-    303:310:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154 -> a
-    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:73 -> b
-    8:16:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:128 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> l0
-    boolean isNewArrayFilledData() -> l2
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.t.b.N0:
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.Value,int,long,short[]):29:32 -> <init>
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():82:82 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value src():46:46 -> M2
+    boolean hasInvariantOutType() -> N0
+    boolean instructionTypeCanThrow() -> T0
+    1:277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():0:276 -> a
+    1:277:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):104 -> a
+    278:278:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42:42 -> a
+    279:280:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
+    281:281:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):61:61 -> a
+    282:282:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
+    283:289:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):126:132 -> a
+    290:290:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144:144 -> a
+    291:297:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):126:132 -> a
+    291:297:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574 -> a
+    291:297:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):144 -> a
+    1:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:72 -> b
+    8:8:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> b
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
+    boolean isNewArrayFilledData() -> j2
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.s.b.O0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):35:35 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):32:37 -> <init>
-    1:1:int maxInValueRegister():76:76 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value dest():55:55 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:1:boolean isSpillingAllowed():207:207 -> P2
-    1:1:void markNoSpilling():203:203 -> Q2
-    boolean instructionTypeCanThrow() -> V0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51:51 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():55:55 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):60:61 -> 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):104:104 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
-    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):119:119 -> a
-    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):124:124 -> a
-    9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):129:129 -> a
-    10:10:boolean definitelyTriggersClassInitialization(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):139:139 -> a
-    11:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):146:157 -> a
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    23:23:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157 -> a
-    24:45:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):158:179 -> a
-    46:59:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):175:188 -> a
-    60:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153:153 -> a
-    61:61:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):178:178 -> a
-    62:62:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
-    63:63:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
-    2:2:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):218:218 -> b
-    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):229:232 -> b
-    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):212:219 -> d
-    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):215:223 -> d
-    com.android.tools.r8.ir.code.NewInstance asNewInstance() -> m0
-    boolean isNewInstance() -> m2
-    1:1:java.lang.String toString():66:66 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.t.b.O0:
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):36:36 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):33:38 -> <init>
+    1:1:int maxInValueRegister():77:77 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value dest():56:56 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:1:boolean isSpillingAllowed():211:211 -> N2
+    1:1:void markNoSpilling():207:207 -> O2
+    boolean instructionTypeCanThrow() -> T0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():56:56 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:62 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):115:115 -> a
+    7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):120:120 -> a
+    8:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):125:125 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):130:130 -> a
+    10:10:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):140:140 -> a
+    11:25:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):147:161 -> a
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    26:26:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):161 -> a
+    27:32:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):162:167 -> a
+    33:33:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):20:20 -> a
+    33:33:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172 -> a
+    34:34:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):19:19 -> a
+    34:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172 -> a
+    35:44:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172:181 -> a
+    45:60:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):177:192 -> a
+    61:61:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):157:157 -> a
+    62:62:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):180:180 -> a
+    63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):203:203 -> a
+    64:64:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    64:64:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):203 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):72:72 -> b
+    2:2:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):222:222 -> b
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):233:236 -> b
+    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):216:223 -> d
+    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):219:227 -> d
+    com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
+    boolean isNewInstance() -> k2
+    1:1:java.lang.String toString():67:67 -> toString
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.s.b.P0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.t.b.P0:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.s.b.Q0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:25 -> <init>
-    int opcode() -> K2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:15:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):45:59 -> a
-    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
-    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66 -> a
-    18:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:76 -> a
-    29:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:78 -> a
-    38:38:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
-    39:39:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
+    int opcode() -> I2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):35:35 -> a
+    2:16:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):45:59 -> a
+    17:17:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:64 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
+    18:18:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66 -> a
+    19:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:76 -> a
+    30:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:78 -> a
+    39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
+    40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
-    com.android.tools.r8.ir.code.Not asNot() -> n0
-    boolean isNot() -> n2
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.t.b.Q0:
+    com.android.tools.r8.ir.code.Not asNot() -> l0
+    boolean isNot() -> l2
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.s.b.R0:
     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>
-    int opcode() -> K2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58 -> a
     2:75:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:131 -> a
@@ -27307,13 +27584,14 @@
     182:193:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):86:97 -> a
     194:194:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):91:91 -> a
     195:240:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):88:133 -> a
-    241:241:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
-    242:242:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
-    243:243:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
+    241:241:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):48:48 -> a
+    242:242:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
+    243:243:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
+    244:244:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
-    com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> o0
-    boolean isNumberConversion() -> o2
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.t.b.R0:
+    com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
+    boolean isNumberConversion() -> m2
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.s.b.S0:
     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
@@ -27339,25 +27617,25 @@
     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.t.b.S0:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.s.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):18:18 -> <init>
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> R2
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    2:2:boolean outTypeKnownToBeBoolean(java.util.Set):98:98 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):98:98 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    com.android.tools.r8.ir.code.Or asOr() -> p0
-    boolean isOr() -> p2
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.t.b.T0:
+    com.android.tools.r8.ir.code.Or asOr() -> n0
+    boolean isOr() -> n2
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.s.b.U0:
     java.util.List operands -> r
     java.util.List definitionUsers -> u
     boolean $assertionsDisabled -> v
@@ -27410,7 +27688,7 @@
     125:125:void addDefinitionsUser(java.util.Map):340:340 -> a
     126:129:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):370:373 -> a
     130:130:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):389:389 -> a
-    131:131:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():854:854 -> a
+    131:131:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():881:881 -> a
     131:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):389 -> a
     132:140:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):389:397 -> a
     boolean isDefinedByInstructionSatisfying(java.util.function.Predicate) -> b
@@ -27424,11 +27702,11 @@
     1:2:boolean verifyIsStackPhi(java.util.Set):367:368 -> c
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):402:404 -> d
     com.android.tools.r8.ir.code.Phi asPhi() -> g
-    1:2:void appendOperand(com.android.tools.r8.ir.code.Value):174:175 -> g
-    3:4:void removeOperand(int):187:188 -> g
+    1:2:void removeOperand(int):187:188 -> g
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():82:82 -> h
-    2:2:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):385:385 -> h
+    2:3:void appendOperand(com.android.tools.r8.ir.code.Value):174:175 -> h
     1:1:void clearDefinitionsUsers():348:348 -> h0
+    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):385:385 -> i
     1:1:java.util.List getOperands():183:183 -> i0
     1:1:boolean isTrivialPhi():224:224 -> j0
     1:10:java.lang.String printPhi():315:324 -> k0
@@ -27437,27 +27715,32 @@
     5:5:void removeDeadPhi():311 -> l0
     6:6:void removeDeadPhi():311:311 -> l0
     1:1:boolean removeTrivialPhi():239:239 -> m0
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.t.b.U0:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.s.b.U0$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>():38:39 -> <clinit>
+    1:1:void <init>(java.lang.String,int):37:37 -> <init>
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.s.b.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
-    1:1:int maxInValueRegister():59:59 -> I2
-    1:1:int maxOutValueRegister():64:64 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    1:1:int maxInValueRegister():59:59 -> G2
+    1:1:int maxOutValueRegister():64:64 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    1:301:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():0:300 -> a
-    1:301:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
-    302:302:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    303:303:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
-    304:304:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):70:70 -> a
-    304:304:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
-    305:305:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
-    306:306:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
+    1:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():0:288 -> a
+    1:289:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):70 -> a
+    290:290:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):29:29 -> a
+    291:291:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    292:292:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    293:293:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):70:70 -> a
+    293:293:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
+    294:294:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    295:295:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
     1:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    boolean isPop() -> r2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.t.b.V0:
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    boolean isPop() -> p2
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.s.b.W0:
     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
@@ -27485,19 +27768,19 @@
     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.t.b.W0:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.s.b.X0:
     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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> T2
-    1:1:boolean instructionTypeCanThrow():134:134 -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> R2
+    1:1:boolean instructionTypeCanThrow():134:134 -> T0
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
-    2:2:int foldIntegers(int,int):114:114 -> a
-    3:3:long foldLongs(long,long):119:119 -> a
-    4:8:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):139:143 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):69:69 -> a
+    3:3:int foldIntegers(int,int):114:114 -> a
+    4:4:long foldLongs(long,long):119:119 -> a
+    5:9:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):139:143 -> a
     1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):64:64 -> b
     2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):89:89 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
@@ -27508,41 +27791,41 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
-    com.android.tools.r8.ir.code.Rem asRem() -> q0
-    boolean isRem() -> s2
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.t.b.X0:
+    com.android.tools.r8.ir.code.Rem asRem() -> o0
+    boolean isRem() -> q2
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.s.b.Y0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():97:97 -> J2
-    int opcode() -> K2
-    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():46:47 -> P2
-    1:1:boolean isReturnVoid():42:42 -> Q2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> R2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:305:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():0:304 -> a
-    1:305:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
-    306:306:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    307:308:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:120 -> a
-    309:309:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:127 -> a
-    310:310:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():97:97 -> H2
+    int opcode() -> I2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeElement getReturnType():46:47 -> N2
+    1:1:boolean isReturnVoid():42:42 -> O2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> P2
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():0:292 -> a
+    1:293:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):114 -> a
+    294:294:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38:38 -> a
+    295:295:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
+    296:297:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:120 -> a
+    298:298:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:127 -> a
+    299:299:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     16:23:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> b
     24:26:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isValueTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeElement):409:411 -> b
     24:26:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):87 -> b
-    com.android.tools.r8.ir.code.Return asReturn() -> r0
-    boolean isReturn() -> t2
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.t.b.Y0:
+    com.android.tools.r8.ir.code.Return asReturn() -> p0
+    boolean isReturn() -> r2
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.s.b.Z0:
     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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> R2
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):63:63 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):78:78 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
@@ -27550,17 +27833,17 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     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.Shl asShl() -> s0
-    boolean isShl() -> u2
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.t.b.Z0:
+    com.android.tools.r8.ir.code.Shl asShl() -> q0
+    boolean isShl() -> s2
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.s.b.a1:
     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() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> R2
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):63:63 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):78:78 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
@@ -27568,11 +27851,11 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     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.Shr asShr() -> t0
-    boolean isShr() -> v2
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.t.b.a1:
+    com.android.tools.r8.ir.code.Shr asShr() -> r0
+    boolean isShr() -> t2
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.s.b.b1:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.t.b.b1:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.s.b.c1:
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> r
     boolean $assertionsDisabled -> s
     int height -> q
@@ -27586,7 +27869,7 @@
     1:1:int getHeight():31:31 -> h0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> i0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.t.b.c1:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.s.b.d1:
     boolean $assertionsDisabled -> r
     com.android.tools.r8.ir.code.StackValue[] stackValues -> q
     1:1:void <clinit>():14:14 -> <clinit>
@@ -27597,164 +27880,166 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> h0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.t.b.d1:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.s.b.e1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> Q2
-    1:1:com.android.tools.r8.ir.code.Value dest():61:61 -> R2
-    boolean instructionTypeCanBeCanonicalized() -> U0
-    boolean instructionTypeCanThrow() -> V0
-    1:2:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):40:41 -> a
-    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):46:47 -> a
-    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):42 -> a
-    5:5:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):57:57 -> a
-    6:6:com.android.tools.r8.ir.code.Value dest():61:61 -> a
-    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95 -> a
-    7:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):95:122 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):119:119 -> a
-    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):116:116 -> a
-    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):113:113 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):110:110 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):107:107 -> a
-    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    41:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):100:124 -> a
-    66:80:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):71:85 -> a
-    81:87:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):83:89 -> a
-    88:88:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):146:146 -> a
-    89:89:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):156:156 -> a
-    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:140 -> a
-    90:90:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):156 -> a
-    91:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):146:146 -> a
-    91:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140 -> a
-    91:91:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):156 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):181:181 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):206:206 -> a
-    94:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):211:211 -> a
-    98:98:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):218:218 -> a
-    99:99:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):223:223 -> a
-    100:100:boolean definitelyTriggersClassInitialization(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):233:233 -> a
-    101:101:boolean outTypeKnownToBeBoolean(java.util.Set):239:239 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):171:175 -> b
-    6:6:boolean lambda$instructionMayTriggerMethodInvocation$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):251:251 -> b
-    1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:140 -> c
-    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):146:146 -> c
-    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140 -> c
-    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):244:252 -> d
-    10:10:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):248:248 -> d
-    1:1:java.lang.String toString():186:186 -> toString
-    com.android.tools.r8.ir.code.StaticGet asStaticGet() -> u0
-    boolean isStaticFieldInstruction() -> w2
-    boolean isStaticGet() -> x2
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.t.b.e1:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value value():68:68 -> O2
+    1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> P2
+    boolean instructionTypeCanBeCanonicalized() -> S0
+    boolean instructionTypeCanThrow() -> T0
+    1:2:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):42:43 -> a
+    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StaticGet):48:49 -> a
+    3:4:com.android.tools.r8.ir.code.StaticGet copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):44 -> a
+    5:5:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59:59 -> a
+    6:6:com.android.tools.r8.ir.code.Value dest():63:63 -> a
+    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):97 -> a
+    7:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):97:124 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):121:121 -> a
+    36:36:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):118:118 -> a
+    37:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):115:115 -> a
+    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):112:112 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):109:109 -> a
+    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):106:106 -> a
+    41:65:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):102:126 -> a
+    66:80:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):73:87 -> a
+    81:87:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):85:91 -> a
+    88:88:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:148 -> a
+    89:89:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):158:158 -> a
+    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142:142 -> a
+    90:90:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):158 -> a
+    91:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:148 -> a
+    91:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> a
+    91:91:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):158 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):183:183 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):208:208 -> a
+    94:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
+    98:98:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):220:220 -> a
+    99:99:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):225:225 -> a
+    100:100:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):235:235 -> a
+    101:101:boolean outTypeKnownToBeBoolean(java.util.Set):241:241 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):173:177 -> b
+    6:6:boolean lambda$instructionMayTriggerMethodInvocation$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):253:253 -> b
+    1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142:142 -> c
+    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:148 -> c
+    2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> c
+    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):246:254 -> d
+    10:18:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):250:258 -> d
+    com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
+    1:1:java.lang.String toString():188:188 -> toString
+    boolean isStaticFieldInstruction() -> u2
+    boolean isStaticGet() -> v2
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.s.b.f1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):36:36 -> <init>
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():155:155 -> J2
-    int opcode() -> K2
-    1:2:com.android.tools.r8.ir.code.Value value():51:52 -> Q2
-    boolean instructionTypeCanThrow() -> V0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:85 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
-    31:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
-    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:73 -> a
-    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
-    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
-    36:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:87 -> a
-    61:83:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):99:121 -> a
-    84:91:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):120:127 -> a
-    92:92:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):121:121 -> a
-    93:93:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142:142 -> a
-    94:94:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    94:94:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):142 -> a
-    95:95:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143:143 -> a
-    96:106:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):161:171 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):191:191 -> a
-    108:108:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):216:216 -> a
-    109:112:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):221:221 -> a
-    113:113:boolean definitelyTriggersClassInitialization(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):233:233 -> a
-    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):181:185 -> b
-    6:6:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):246:246 -> b
-    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):239:247 -> d
-    10:10:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):243:243 -> d
-    1:1:java.lang.String toString():196:196 -> toString
-    com.android.tools.r8.ir.code.StaticPut asStaticPut() -> v0
-    boolean isStaticFieldInstruction() -> w2
-    boolean isStaticPut() -> y2
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.t.b.f1:
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():161:161 -> H2
+    int opcode() -> I2
+    1:2:com.android.tools.r8.ir.code.Value value():52:53 -> O2
+    boolean instructionTypeCanThrow() -> T0
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):47:47 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):59:86 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
+    31:31:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
+    32:32:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
+    33:33:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
+    34:34:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:71 -> a
+    35:35:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:68 -> a
+    36:60:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:88 -> a
+    61:84:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):100:123 -> a
+    85:85:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):122:122 -> a
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():46:46 -> a
+    86:86:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):128 -> a
+    87:92:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):128:133 -> a
+    93:93:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):123:123 -> a
+    94:94:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148:148 -> a
+    95:95:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    95:95:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):148 -> a
+    96:96:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):149:149 -> a
+    97:107:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):167:177 -> a
+    108:108:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):197:197 -> a
+    109:109:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):222:222 -> a
+    110:113:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):227:227 -> a
+    114:114:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):239:239 -> a
+    1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):187:191 -> b
+    6:6:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):252:252 -> b
+    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):245:253 -> d
+    10:18:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):249:257 -> d
+    com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
+    1:1:java.lang.String toString():202:202 -> toString
+    boolean isStaticFieldInstruction() -> u2
+    boolean isStaticPut() -> w2
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.s.b.g1:
     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>
-    1:1:int maxInValueRegister():57:57 -> I2
-    int maxOutValueRegister() -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> O2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:321:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():0:320 -> a
-    1:321:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):68 -> a
-    322:322:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:73 -> a
-    323:323:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):78:78 -> a
-    324:324:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):83:83 -> a
-    325:325:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:88 -> a
-    326:326:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):93:93 -> a
-    327:327:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:103 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> b
-    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-    com.android.tools.r8.ir.code.Store asStore() -> w0
-    boolean isStore() -> z2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.t.b.g1:
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):24:24 -> <init>
+    1:1:int maxInValueRegister():58:58 -> G2
+    int maxOutValueRegister() -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value src():38:38 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():0:306 -> a
+    1:307:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):69 -> a
+    308:308:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):34:34 -> a
+    309:309:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:74 -> a
+    310:310:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):79:79 -> a
+    311:311:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):84:84 -> a
+    312:312:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):89:89 -> a
+    313:313:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):94:94 -> a
+    314:314:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):104:104 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):53:53 -> b
+    1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):109:110 -> c
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+    com.android.tools.r8.ir.code.Store asStore() -> u0
+    boolean isStore() -> x2
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.s.b.h1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():17:17 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):23:25 -> <init>
-    boolean isStringSwitch() -> A2
-    1:1:int maxInValueRegister():119:119 -> I2
-    1:1:int maxOutValueRegister():124:124 -> J2
-    int opcode() -> K2
-    1:4:boolean valid():62:65 -> S2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):50:50 -> a
-    2:2:com.android.tools.r8.graph.DexString getKey(int):80:80 -> a
-    2:2:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):51 -> a
-    3:3:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):51:51 -> a
-    4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
-    5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
-    6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
+    1:1:int maxInValueRegister():119:119 -> G2
+    1:1:int maxOutValueRegister():124:124 -> H2
+    int opcode() -> I2
+    1:4:boolean valid():62:65 -> Q2
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
+    2:2:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):50:50 -> a
+    3:3:com.android.tools.r8.graph.DexString getKey(int):80:80 -> a
+    3:3:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):51 -> a
+    4:4:void forEachCase(com.android.tools.r8.utils.ThrowingBiConsumer):51:51 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):99:99 -> a
+    6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):104:104 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):114:114 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):109:109 -> b
     1:1:com.android.tools.r8.graph.DexString getKey(int):80:80 -> e
     1:4:java.lang.String toString():85:88 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):80:80 -> toString
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
-    com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> x0
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.t.b.h1:
+    com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
+    boolean isStringSwitch() -> y2
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.s.b.i1:
     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>
-    boolean isSub() -> B2
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    1:8:int maxInOutValueRegisterSize():131:138 -> R2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:8:int maxInOutValueRegisterSize():131:138 -> P2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> R2
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):62:62 -> a
-    2:37:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):164:199 -> a
-    38:38:com.android.tools.r8.code.Instruction CreateInt(int,int,int):47:47 -> a
-    38:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):200 -> a
-    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):202:202 -> a
-    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):165:165 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):37:37 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateDouble(int,int,int):62:62 -> a
+    3:38:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):164:199 -> a
+    39:39:com.android.tools.r8.code.Instruction CreateInt(int,int,int):47:47 -> a
+    39:39:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):200 -> a
+    40:40:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):202:202 -> a
+    41:41:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):165:165 -> a
     1:1:com.android.tools.r8.code.Instruction CreateFloat(int,int,int):57:57 -> b
     2:2:com.android.tools.r8.code.Instruction CreateDouble2Addr(int,int):82:82 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):99:99 -> b
@@ -27767,44 +28052,45 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):88:88 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):52:52 -> f
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
-    com.android.tools.r8.ir.code.Sub asSub() -> y0
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.t.b.i1:
+    com.android.tools.r8.ir.code.Sub asSub() -> w0
+    boolean isSub() -> z2
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.s.b.j1:
     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>
     2:5:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:29 -> <init>
-    boolean isSwap() -> C2
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():87:87 -> J2
-    int opcode() -> K2
-    boolean hasInvariantOutType() -> P0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:325:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():0:324 -> a
-    1:325:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):93 -> a
+    boolean isSwap() -> A2
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():87:87 -> H2
+    int opcode() -> I2
+    boolean hasInvariantOutType() -> N0
+    1:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():0:310 -> a
+    1:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):93 -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    326:326:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
-    327:327:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
+    312:312:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39:39 -> a
+    313:313:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
+    314:314:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> b
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.t.b.j1:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.s.b.k1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():10:10 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):16:18 -> <init>
-    boolean isSwitch() -> D2
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> O2
-    1:1:int getFallthroughBlockIndex():58:58 -> P2
-    1:1:int numberOfKeys():71:71 -> Q2
-    1:1:int[] targetBlockIndices():43:43 -> R2
-    1:2:boolean valid():28:29 -> S2
-    3:3:int getTargetBlockIndex(int):39:39 -> S2
-    3:3:boolean valid():29 -> S2
-    4:4:int getFallthroughBlockIndex():58:58 -> S2
-    4:4:boolean valid():29 -> S2
-    5:5:boolean valid():29:29 -> S2
-    1:1:com.android.tools.r8.ir.code.Value value():24:24 -> T2
+    boolean isSwitch() -> B2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():54:54 -> M2
+    1:1:int getFallthroughBlockIndex():58:58 -> N2
+    1:1:int numberOfKeys():71:71 -> O2
+    1:1:int[] targetBlockIndices():43:43 -> P2
+    1:2:boolean valid():28:29 -> Q2
+    3:3:int getTargetBlockIndex(int):39:39 -> Q2
+    3:3:boolean valid():29 -> Q2
+    4:4:int getFallthroughBlockIndex():58:58 -> Q2
+    4:4:boolean valid():29 -> Q2
+    5:5:boolean valid():29:29 -> Q2
+    1:1:com.android.tools.r8.ir.code.Value value():24:24 -> R2
     1:1:int getTargetBlockIndex(int):39:39 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):67:67 -> b
     1:1:void setFallthroughBlockIndex(int):62:62 -> c
@@ -27812,59 +28098,58 @@
     2:2:int[] targetBlockIndices():43:43 -> d
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):35:35 -> d
-    com.android.tools.r8.ir.code.Switch asSwitch() -> z0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.t.b.k1:
+    com.android.tools.r8.ir.code.Switch asSwitch() -> x0
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.s.b.l1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.ir.code.Throw asThrow() -> A0
-    boolean isThrow() -> E2
-    int maxInValueRegister() -> I2
-    1:1:int maxOutValueRegister():49:49 -> J2
-    int opcode() -> K2
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> P2
-    boolean instructionTypeCanThrow() -> V0
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:329:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():0:328 -> a
-    1:329:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
-    330:330:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
-    331:331:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
-    332:332:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
-    333:350:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):91:108 -> a
+    boolean isThrow() -> C2
+    int maxInValueRegister() -> G2
+    1:1:int maxOutValueRegister():49:49 -> H2
+    int opcode() -> I2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> N2
+    boolean instructionTypeCanThrow() -> T0
+    1:315:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():0:314 -> a
+    1:315:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):76 -> a
+    316:316:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
+    317:317:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
+    318:318:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):81:81 -> a
+    319:319:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:86 -> a
+    320:337:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):91:108 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.t.b.m1:
+    com.android.tools.r8.ir.code.Throw asThrow() -> y0
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.s.b.n1:
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> b
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> d
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.t.b.l1:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.s.b.m1:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> b
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> d
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.t.b.n1:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.s.b.o1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isUnop() -> F2
-    int maxInValueRegister() -> I2
-    int maxOutValueRegister() -> J2
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> O2
-    boolean hasInvariantOutType() -> P0
-    1:333:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():0:332 -> a
-    1:333:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
-    334:335:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
-    336:336:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
-    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.t.b.o1:
+    boolean isUnop() -> D2
+    int maxInValueRegister() -> G2
+    int maxOutValueRegister() -> H2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> M2
+    boolean hasInvariantOutType() -> N0
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():0:318 -> a
+    1:319:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):51 -> a
+    320:321:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
+    322:322:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
+    boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.s.b.p1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    com.android.tools.r8.ir.code.Ushr asUshr() -> B0
-    boolean isUshr() -> G2
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    boolean isUshr() -> E2
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> R2
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):27:27 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):53:53 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):63:63 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):78:78 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
@@ -27872,7 +28157,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):73:73 -> c
     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.Value -> com.android.tools.r8.t.b.p1:
+    com.android.tools.r8.ir.code.Ushr asUshr() -> z0
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.s.b.q1:
     boolean $assertionsDisabled -> p
     int needsRegister -> j
     boolean isThis -> k
@@ -27889,184 +28175,190 @@
     java.util.LinkedList phiUsers -> e
     com.android.tools.r8.utils.LongInterval valueRange -> l
     java.util.LinkedList users -> c
-    1:164:void <clinit>():51:214 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):231:231 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):217:235 -> <init>
-    1:1:boolean hasDebugUsers():501:501 -> A
-    1:1:boolean hasLocalInfo():319:319 -> B
-    1:1:boolean hasPhiUsers():505:505 -> C
-    1:1:boolean hasUsers():509:509 -> D
-    1:1:boolean hasUsersInfo():638:638 -> E
-    1:1:boolean hasValueRange():1003:1003 -> F
-    1:8:boolean internalComputeNeedsRegister():786:793 -> G
-    1:1:boolean isArgument():929:929 -> H
-    1:1:boolean isConstClass():887:887 -> I
-    1:1:boolean isConstNumber():863:863 -> J
-    1:1:boolean isConstString():871:871 -> K
-    1:1:boolean isConstant():891:891 -> L
-    1:1:boolean isDexItemBasedConstString():875:875 -> M
+    1:164:void <clinit>():52:215 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):232:232 -> <init>
+    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):218:236 -> <init>
+    1:1:boolean hasDebugUsers():502:502 -> A
+    1:1:boolean hasLocalInfo():320:320 -> B
+    1:1:boolean hasPhiUsers():506:506 -> C
+    1:1:boolean hasUsers():510:510 -> D
+    1:1:boolean hasUsersInfo():643:643 -> E
+    1:1:boolean hasValueRange():1030:1030 -> F
+    1:8:boolean internalComputeNeedsRegister():813:820 -> G
+    1:1:boolean isArgument():956:956 -> H
+    1:1:boolean isConstClass():914:914 -> I
+    1:1:boolean isConstNumber():890:890 -> J
+    1:1:boolean isConstString():898:898 -> K
+    1:1:boolean isConstant():918:918 -> L
+    1:1:boolean isDexItemBasedConstString():902:902 -> M
     boolean isFixedRegisterValue() -> N
-    1:1:boolean isLinked():408:408 -> O
-    1:3:boolean isNeverNull():923:925 -> P
-    1:1:boolean isThis():995:995 -> Q
-    1:1:boolean isUsed():550:550 -> R
-    2:2:int numberOfDebugUsers():542:542 -> R
-    2:2:boolean isUsed():550 -> R
+    1:1:boolean isLinked():409:409 -> O
+    1:3:boolean isNeverNull():950:952 -> P
+    1:1:boolean isThis():1022:1022 -> Q
+    1:1:boolean isUsed():551:551 -> R
+    2:2:int numberOfDebugUsers():543:543 -> R
+    2:2:boolean isUsed():551 -> R
     boolean isValueOnStack() -> S
-    1:3:boolean isZero():1088:1090 -> T
-    1:3:void markAsThis():984:986 -> U
-    1:1:void markNonDebugLocalRead():147:147 -> V
-    1:3:boolean needsRegister():770:772 -> W
-    1:1:int numberOfAllNonDebugUsers():538:538 -> X
-    1:1:int numberOfAllUsers():546 -> X
-    2:2:int numberOfDebugUsers():542:542 -> X
-    2:2:int numberOfAllUsers():546 -> X
-    1:5:int numberOfPhiUsers():530:534 -> Y
-    1:5:int numberOfUsers():522:526 -> Z
+    1:3:boolean isZero():1115:1117 -> T
+    1:3:void markAsThis():1011:1013 -> U
+    1:1:void markNonDebugLocalRead():148:148 -> V
+    1:3:boolean needsRegister():797:799 -> W
+    1:1:int numberOfAllNonDebugUsers():539:539 -> X
+    1:1:int numberOfAllUsers():547 -> X
+    2:2:int numberOfDebugUsers():543:543 -> X
+    2:2:int numberOfAllUsers():547 -> X
+    1:5:int numberOfPhiUsers():531:535 -> Y
+    1:5:int numberOfUsers():523:527 -> Z
     boolean isPhi() -> a
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):55:68 -> a
-    15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57:57 -> a
-    16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    16:18:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57 -> a
-    19:78:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):73:132 -> a
-    79:80:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):127:128 -> a
-    81:82:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):122:123 -> a
-    83:84:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):117:118 -> a
-    85:89:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):109:113 -> a
-    90:91:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):104:105 -> a
-    92:93:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:100 -> a
-    94:110:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):78:94 -> a
-    111:115:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):91:95 -> a
-    116:116:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):138:138 -> a
-    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):142:142 -> a
-    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):138 -> a
-    118:138:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):276:296 -> a
-    139:140:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):302:303 -> a
-    141:143:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):323:325 -> a
-    144:145:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):377:378 -> a
-    146:147:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):382:383 -> a
-    146:147:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378 -> a
-    148:156:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():182:190 -> a
-    148:156:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):383 -> a
-    148:156:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378 -> a
-    157:157:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():188:188 -> a
-    157:157:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):383 -> a
-    157:157:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378 -> a
-    158:158:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():185:185 -> a
-    158:158:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):383 -> a
-    158:158:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378 -> a
-    159:159:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378:378 -> a
-    160:161:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):428:429 -> a
-    162:164:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):457:459 -> a
-    165:172:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):468:475 -> a
-    173:173:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):474:474 -> a
-    174:175:void addPhiUser(com.android.tools.r8.ir.code.Phi):602:603 -> a
-    176:176:void addAffectedValuesTo(java.util.Set):659:659 -> a
-    177:182:void forEachAffectedValue(java.util.function.Consumer):663:668 -> a
-    183:210:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):700:727 -> a
-    211:220:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):734:743 -> a
-    221:233:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):195:207 -> a
-    221:233:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):743 -> a
-    234:234:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):743:743 -> a
-    235:236:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):761:762 -> a
-    237:238:void setNeedsRegister(boolean):776:777 -> a
-    239:248:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):895:904 -> a
-    249:249:void setValueRange(com.android.tools.r8.utils.LongInterval):999:999 -> a
-    250:250:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1031:1031 -> a
-    251:251:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1036:1036 -> a
-    251:251:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1031 -> a
-    252:252:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1036:1036 -> a
-    253:280:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1053:1080 -> a
-    281:282:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1099:1100 -> a
-    283:286:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1119:1119 -> a
-    294:295:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1127:1128 -> a
-    296:298:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1176:1178 -> a
-    299:299:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    299:299:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1179 -> a
-    300:312:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1180:1192 -> a
-    313:313:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    313:313:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1193 -> a
-    314:327:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1194:1207 -> a
-    328:328:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1202:1202 -> a
-    1:15:boolean onlyDependsOnArgument():933:947 -> a0
-    16:16:boolean onlyDependsOnArgument():945:945 -> a0
-    1:2:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):612:613 -> b
-    3:4:void addDebugUser(com.android.tools.r8.ir.code.Instruction):617:618 -> b
-    5:7:java.util.Set affectedValues():653:655 -> b
-    8:16:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):748:756 -> b
-    17:17:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):908:908 -> b
-    18:40:boolean knownToBeBoolean(java.util.Set):958:980 -> b
-    41:48:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1106:1113 -> b
-    49:81:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1137:1169 -> b
-    82:82:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1140:1140 -> b
-    1:1:com.android.tools.r8.ir.code.ValueType outType():854:854 -> b0
-    1:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):554:562 -> c
-    10:11:void addUser(com.android.tools.r8.ir.code.Instruction):577:578 -> c
-    12:13:void removePhiUser(com.android.tools.r8.ir.code.Phi):607:608 -> c
-    14:14:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1148:1148 -> c
-    1:1:int requiredRegisters():311:311 -> c0
-    1:1:int compareTo(java.lang.Object):51:51 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.code.Value):815:815 -> compareTo
-    2:2:int compareTo(java.lang.Object):51 -> compareTo
+    1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):56:69 -> a
+    15:25:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):58:58 -> a
+    26:85:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):74:133 -> a
+    86:87:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):128:129 -> a
+    88:89:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):123:124 -> a
+    90:91:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):118:119 -> a
+    92:96:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):110:114 -> a
+    97:98:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):105:106 -> a
+    99:100:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):100:101 -> a
+    101:117:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):79:95 -> a
+    118:122:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):92:96 -> a
+    123:123:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):139:139 -> a
+    124:124:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):143:143 -> a
+    124:124:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):139 -> a
+    125:145:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):277:297 -> a
+    146:147:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):303:304 -> a
+    148:150:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):324:326 -> a
+    151:152:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):378:379 -> a
+    153:154:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):383:384 -> a
+    153:154:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379 -> a
+    155:163:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():183:191 -> a
+    155:163:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):384 -> a
+    155:163:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379 -> a
+    164:164:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():189:189 -> a
+    164:164:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):384 -> a
+    164:164:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379 -> a
+    165:165:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():186:186 -> a
+    165:165:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):384 -> a
+    165:165:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379 -> a
+    166:166:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):379:379 -> a
+    167:168:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):429:430 -> a
+    169:171:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):458:460 -> a
+    172:179:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):469:476 -> a
+    180:180:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):475:475 -> a
+    181:182:void addPhiUser(com.android.tools.r8.ir.code.Phi):607:608 -> a
+    183:183:void addAffectedValuesTo(java.util.Set):664:664 -> a
+    184:189:void forEachAffectedValue(java.util.function.Consumer):668:673 -> a
+    190:193:void replaceSelectiveInstructionUsers(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):709:712 -> a
+    194:221:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):727:754 -> a
+    222:231:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):761:770 -> a
+    232:244:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):196:208 -> a
+    232:244:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):770 -> a
+    245:245:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):770:770 -> a
+    246:247:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):788:789 -> a
+    248:249:void setNeedsRegister(boolean):803:804 -> a
+    250:259:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):922:931 -> a
+    260:260:void setValueRange(com.android.tools.r8.utils.LongInterval):1026:1026 -> a
+    261:261:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1058:1058 -> a
+    262:262:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1063:1063 -> a
+    262:262:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1058 -> a
+    263:263:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1063:1063 -> a
+    264:291:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1080:1107 -> a
+    292:293:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1126:1127 -> a
+    294:297:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1146:1146 -> a
+    305:306:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1154:1155 -> a
+    307:309:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1206:1208 -> a
+    310:310:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    310:310:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1209 -> a
+    311:323:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1210:1222 -> a
+    324:324:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    324:324:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1223 -> a
+    325:337:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1224:1236 -> a
+    338:338:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1231:1231 -> a
+    1:15:boolean onlyDependsOnArgument():960:974 -> a0
+    16:16:boolean onlyDependsOnArgument():972:972 -> a0
+    1:2:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):617:618 -> b
+    3:4:void addDebugUser(com.android.tools.r8.ir.code.Instruction):622:623 -> b
+    5:7:java.util.Set affectedValues():658:660 -> b
+    8:16:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):775:783 -> b
+    17:17:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):935:935 -> b
+    18:40:boolean knownToBeBoolean(java.util.Set):985:1007 -> b
+    41:48:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1133:1140 -> b
+    49:80:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1168:1199 -> b
+    81:81:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1171:1171 -> b
+    1:1:com.android.tools.r8.ir.code.ValueType outType():881:881 -> b0
+    1:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):555:563 -> c
+    10:11:void addUser(com.android.tools.r8.ir.code.Instruction):578:579 -> c
+    12:13:void removePhiUser(com.android.tools.r8.ir.code.Phi):612:613 -> c
+    14:14:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1178:1178 -> c
+    1:1:int requiredRegisters():312:312 -> c0
+    1:1:int compareTo(java.lang.Object):52:52 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.code.Value):842:842 -> compareTo
+    2:2:int compareTo(java.lang.Object):52 -> compareTo
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> d
-    1:1:java.util.Set aliasedUsers():453:453 -> d
-    2:4:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):457:459 -> d
-    2:4:java.util.Set aliasedUsers():453 -> d
-    5:6:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):587:588 -> d
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():448:449 -> d0
+    1:1:java.util.Set aliasedUsers():454:454 -> d
+    2:4:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):458:460 -> d
+    2:4:java.util.Set aliasedUsers():454 -> d
+    5:6:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):588:589 -> d
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():449:450 -> d0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
-    1:4:void linkTo(com.android.tools.r8.ir.code.Value):387:390 -> e
-    5:9:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):630:634 -> e
-    1:4:java.util.Set uniquePhiUsers():486:489 -> e0
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):582:583 -> f
-    3:8:void clearUsers():592:597 -> f
-    9:21:void replaceUsers(com.android.tools.r8.ir.code.Value):675:687 -> f
-    1:4:java.util.Set uniqueUsers():437:440 -> f0
+    1:4:void linkTo(com.android.tools.r8.ir.code.Value):388:391 -> e
+    5:9:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):635:639 -> e
+    1:4:java.util.Set uniquePhiUsers():487:490 -> e0
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):583:584 -> f
+    3:4:void clearUsers():593:594 -> f
+    5:6:void clearPhiUsers():602:603 -> f
+    5:6:void clearUsers():595 -> f
+    7:8:void clearUsers():596:597 -> f
+    9:10:void replacePhiUsers(com.android.tools.r8.ir.code.Value):699:700 -> f
+    11:12:void clearPhiUsers():602:603 -> f
+    11:12:void replacePhiUsers(com.android.tools.r8.ir.code.Value):702 -> f
+    1:4:java.util.Set uniqueUsers():438:441 -> f0
     com.android.tools.r8.ir.code.Phi asPhi() -> g
-    1:2:boolean usedInMonitorOperation():568:569 -> g0
-    1:1:int hashCode():820:820 -> hashCode
-    1:6:void clearUsersInfo():642:647 -> i
-    1:2:void computeNeedsRegister():781:782 -> j
-    1:1:java.util.Set debugUsers():493:493 -> k
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():481:482 -> l
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():267:267 -> m
-    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():266:266 -> m
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():858:859 -> n
-    1:7:java.util.List getDebugLocalEnds():354:360 -> o
-    1:7:java.util.List getDebugLocalStarts():341:347 -> p
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():247:248 -> q
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():766:766 -> r
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():315:315 -> s
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():420:420 -> t
-    1:26:java.lang.String toString():825:850 -> toString
-    1:1:int getNumber():307:307 -> u
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():424:424 -> v
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():413 -> v
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1132:1132 -> w
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1015:1025 -> x
-    1:1:boolean hasAliasedValue():252:252 -> y
-    1:1:boolean hasAnyUsers():497:497 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.t.b.p1$a:
+    1:13:void replaceUsers(com.android.tools.r8.ir.code.Value):680:692 -> g
+    1:2:boolean usedInMonitorOperation():569:570 -> g0
+    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():1159:1159 -> h
+    1:1:int hashCode():847:847 -> hashCode
+    1:6:void clearUsersInfo():647:652 -> i
+    1:2:void computeNeedsRegister():808:809 -> j
+    1:1:java.util.Set debugUsers():494:494 -> k
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():482:483 -> l
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():268:268 -> m
+    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():267:267 -> m
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():885:886 -> n
+    1:7:java.util.List getDebugLocalEnds():355:361 -> o
+    1:7:java.util.List getDebugLocalStarts():342:348 -> p
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():248:249 -> q
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():793:793 -> r
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():316:316 -> s
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():421:421 -> t
+    1:26:java.lang.String toString():852:877 -> toString
+    1:1:int getNumber():308:308 -> u
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():425:425 -> v
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():414 -> v
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1163:1163 -> w
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1042:1052 -> x
+    1:1:boolean hasAliasedValue():253:253 -> y
+    1:1:boolean hasAnyUsers():498:498 -> z
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.s.b.q1$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.t.b.p1$b:
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):158:158 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):156:159 -> <init>
+com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.s.b.q1$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
     com.android.tools.r8.ir.code.Value$DebugUse LIVE_FINAL -> d
     com.android.tools.r8.ir.code.Value$DebugUse END -> c
     boolean $assertionsDisabled -> f
-    1: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.t.b.q1:
+    1:3:void <clinit>():166:166 -> <clinit>
+    1:1:void <init>(java.lang.String,int):166:166 -> <init>
+com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.s.b.r1:
     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.t.b.r1:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.s.b.s1:
     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
@@ -28096,7 +28388,7 @@
     40:55:com.android.tools.r8.ir.code.ValueType fromType(com.android.tools.r8.ir.analysis.type.TypeElement):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.t.b.s1:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.s.b.t1:
     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
@@ -28130,20 +28422,20 @@
     58:82:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):133:157 -> a
     83:83:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.t.b.t1:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.s.b.u1:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.t.b.u1:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.s.b.v1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    com.android.tools.r8.ir.code.Xor asXor() -> C0
-    boolean isXor() -> H2
-    int opcode() -> K2
-    boolean isCommutative() -> P2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> T2
-    java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
+    com.android.tools.r8.ir.code.Xor asXor() -> A0
+    boolean isXor() -> F2
+    int opcode() -> I2
+    boolean isCommutative() -> N2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> R2
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
-    1:1:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
-    2:2:boolean outTypeKnownToBeBoolean(java.util.Set):98:98 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):28:28 -> a
+    2:2:com.android.tools.r8.code.Instruction CreateInt(int,int,int):48:48 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):98:98 -> a
     1:1:com.android.tools.r8.code.Instruction CreateInt2Addr(int,int):58:58 -> b
     2:2:com.android.tools.r8.code.Instruction CreateIntLit16(int,int,int):73:73 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> b
@@ -28179,9 +28471,9 @@
     1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):272:273 -> a
     3:3:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():29:29 -> a
     3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):274 -> a
-    4:4:com.android.tools.r8.utils.collections.ProgramMethodSet extractLeaves():282:282 -> a
-    5:17:com.android.tools.r8.utils.collections.ProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):290:302 -> a
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():286:286 -> b
+    4:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet extractLeaves():282:282 -> a
+    5:17:com.android.tools.r8.utils.collections.SortedProgramMethodSet extractNodes(java.util.function.Predicate,java.util.function.Consumer):290:302 -> a
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet extractRoots():286:286 -> b
 com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.ir.conversion.d$a:
     java.util.Set callees -> c
     java.util.Set callers -> d
@@ -28290,90 +28582,90 @@
     java.util.Map calleesToBeRemoved -> e
     java.util.Map writersToBeRemoved -> f
     java.util.Map removedCallEdges -> g
-    1:1:void <clinit>():383:383 -> <clinit>
-    1:80:void <init>():383:462 -> <init>
-    1:2:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):469:470 -> a
-    3:9:void prepareForNewTraversal():483:489 -> a
-    3:9:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):471 -> a
-    10:14:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):472:476 -> a
-    15:20:void reset():493:498 -> a
-    15:20:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):478 -> a
-    21:22:void lambda$traverse$0(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.CallGraph$Node):601:602 -> a
-    23:47:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):619:643 -> a
-    48:49:boolean verifyCycleSatisfies(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):727:728 -> a
-    48:49:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):643 -> a
-    50:52:void recoverStack(java.util.LinkedList):770:772 -> a
-    50:52:boolean verifyCycleSatisfies(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):729 -> a
-    50:52:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):643 -> a
-    53:74:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):648:669 -> a
-    75:90:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):734:749 -> a
-    75:90:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):673 -> a
-    91:94:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):678:681 -> a
-    95:97:void recoverStack(java.util.LinkedList):770:772 -> a
-    95:97:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):685 -> a
-    98:98:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):753:753 -> a
-    98:98:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):673 -> a
+    1:1:void <clinit>():382:382 -> <clinit>
+    1:80:void <init>():382:461 -> <init>
+    1:2:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):468:469 -> a
+    3:9:void prepareForNewTraversal():482:488 -> a
+    3:9:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):470 -> a
+    10:14:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):471:475 -> a
+    15:20:void reset():492:497 -> a
+    15:20:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles(java.util.Collection):477 -> a
+    21:22:void lambda$traverse$0(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.CallGraph$Node):600:601 -> a
+    23:47:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):618:642 -> a
+    48:49:boolean verifyCycleSatisfies(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):726:727 -> a
+    48:49:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):642 -> a
+    50:52:void recoverStack(java.util.LinkedList):769:771 -> a
+    50:52:boolean verifyCycleSatisfies(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):728 -> a
+    50:52:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):642 -> a
+    53:74:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):647:668 -> a
+    75:90:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):733:748 -> a
+    75:90:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):672 -> a
+    91:94:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):677:680 -> a
+    95:97:void recoverStack(java.util.LinkedList):769:771 -> a
+    95:97:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):684 -> a
+    98:98:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):752:752 -> a
+    98:98:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):672 -> a
     99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    99:99:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):753 -> a
-    99:99:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):673 -> a
+    99:99:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):752 -> a
+    99:99:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):672 -> a
     100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    100:100:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):753 -> a
-    100:100:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):673 -> a
-    101:101:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):753:753 -> a
-    101:101:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):673 -> a
-    102:103:boolean lambda$iterateCalleesAndWriters$2(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$StackEntryInfo,java.util.LinkedList):646:647 -> a
-    104:108:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):718:722 -> a
-    109:110:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):759:760 -> a
-    111:111:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordCallEdgeRemoval$5(com.android.tools.r8.graph.DexEncodedMethod):765:765 -> a
-    1:14:void traverse(java.util.Collection):558:571 -> b
-    15:19:void push(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):691:695 -> b
-    15:19:void traverse(java.util.Collection):572 -> b
-    20:21:void traverse(java.util.Collection):578:579 -> b
-    22:31:void traverse(java.util.Collection):577:586 -> b
-    32:40:void traverse(java.util.Collection):585:593 -> b
-    41:46:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):700:705 -> b
-    41:46:void traverse(java.util.Collection):593 -> b
-    47:62:void traverse(java.util.Collection):594:609 -> b
-    63:63:void lambda$traverse$1(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.CallGraph$Node):610:610 -> b
-    64:64:java.util.Set lambda$removeCallEdge$3(com.android.tools.r8.ir.conversion.CallGraph$Node):710:710 -> b
-    65:67:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):764:766 -> b
-    1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):710:710 -> c
-    2:2:java.util.Set lambda$removeFieldReadEdge$4(com.android.tools.r8.ir.conversion.CallGraph$Node):714:714 -> c
-    1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):714:714 -> d
+    100:100:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):752 -> a
+    100:100:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):672 -> a
+    101:101:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):752:752 -> a
+    101:101:com.android.tools.r8.ir.conversion.CallGraph$Node iterateCalleesAndWriters(java.util.Iterator,com.android.tools.r8.ir.conversion.CallGraph$Node):672 -> a
+    102:103:boolean lambda$iterateCalleesAndWriters$2(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$StackEntryInfo,java.util.LinkedList):645:646 -> a
+    104:108:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):717:721 -> a
+    109:110:boolean callEdgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):758:759 -> a
+    111:111:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$recordCallEdgeRemoval$5(com.android.tools.r8.graph.DexEncodedMethod):764:764 -> a
+    1:14:void traverse(java.util.Collection):557:570 -> b
+    15:19:void push(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):690:694 -> b
+    15:19:void traverse(java.util.Collection):571 -> b
+    20:21:void traverse(java.util.Collection):577:578 -> b
+    22:31:void traverse(java.util.Collection):576:585 -> b
+    32:40:void traverse(java.util.Collection):584:592 -> b
+    41:46:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):699:704 -> b
+    41:46:void traverse(java.util.Collection):592 -> b
+    47:62:void traverse(java.util.Collection):593:608 -> b
+    63:63:void lambda$traverse$1(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem,com.android.tools.r8.ir.conversion.CallGraph$Node):609:609 -> b
+    64:64:java.util.Set lambda$removeCallEdge$3(com.android.tools.r8.ir.conversion.CallGraph$Node):709:709 -> b
+    65:67:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):763:765 -> b
+    1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):709:709 -> c
+    2:2:java.util.Set lambda$removeFieldReadEdge$4(com.android.tools.r8.ir.conversion.CallGraph$Node):713:713 -> c
+    1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):713:713 -> d
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge -> com.android.tools.r8.ir.conversion.g$a$a:
     com.android.tools.r8.ir.conversion.CallGraph$Node callee -> b
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):393:395 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$600(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):388:388 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$700(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):388:388 -> b
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):392:394 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$600(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):387:387 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$700(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):387:387 -> b
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.ir.conversion.g$a$b:
     java.util.Map removedCallEdges -> a
-    1:2:void <init>(java.util.Map):416:417 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):421:421 -> a
-    2:3:int numberOfRemovedCallEdges():426:427 -> a
+    1:2:void <init>(java.util.Map):415:416 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):420:420 -> a
+    2:3:int numberOfRemovedCallEdges():425:426 -> a
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem -> com.android.tools.r8.ir.conversion.g$a$c:
     com.android.tools.r8.ir.conversion.CallGraph$Node callerOrReader -> a
     java.util.Iterator calleesAndWriters -> b
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.Iterator):541:543 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.Iterator):540:542 -> <init>
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem asIterator() -> a
-    1:1:java.util.Iterator access$400(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem):537:537 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$500(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem):537:537 -> b
+    1:1:java.util.Iterator access$400(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem):536:536 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$500(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem):536:536 -> b
     boolean isIterator() -> c
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem -> com.android.tools.r8.ir.conversion.g$a$d:
     com.android.tools.r8.ir.conversion.CallGraph$Node node -> a
-    1:2:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node):522:523 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem):519:519 -> a
+    1:2:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node):521:522 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem):518:518 -> a
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem asNode() -> b
     boolean isNode() -> d
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$StackEntryInfo -> com.android.tools.r8.ir.conversion.g$a$e:
     com.android.tools.r8.ir.conversion.CallGraph$Node predecessor -> b
     boolean processed -> c
     int index -> a
-    1:3:void <init>(int,com.android.tools.r8.ir.conversion.CallGraph$Node):406:408 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.ir.conversion.CallGraph$Node):405:407 -> <init>
 com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$WorkItem -> com.android.tools.r8.ir.conversion.g$a$f:
-    1:1:void <init>():501:501 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$1):501:501 -> <init>
+    1:1:void <init>():500:500 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$1):500:500 -> <init>
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$IteratorWorkItem asIterator() -> a
     com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$NodeWorkItem asNode() -> b
     boolean isIterator() -> c
@@ -28387,59 +28679,57 @@
     1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):113:116 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexProgramClass):120:122 -> a
     4:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):127:128 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     6:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128 -> a
     7:9:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128:130 -> a
     10:17:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):135:142 -> a
-    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():337:337 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():334:334 -> a
     18:18:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):142 -> a
     19:25:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):146:152 -> a
-    26:26:void addFieldReadEdge(com.android.tools.r8.graph.DexEncodedMethod):156:156 -> a
-    27:31:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):160:164 -> a
-    27:31:void addFieldReadEdge(com.android.tools.r8.graph.DexEncodedMethod):156 -> a
-    32:49:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:185 -> a
-    50:50:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():329:329 -> a
-    50:50:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185 -> a
-    51:51:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):186:186 -> a
-    52:58:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185:191 -> a
-    59:62:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):176:179 -> a
-    63:64:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):198:199 -> a
-    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    65:65:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):199 -> a
-    66:116:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):201:251 -> a
-    117:122:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):217:222 -> a
-    123:129:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):221:227 -> a
-    130:131:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):229:230 -> a
-    132:134:void lambda$processInvokeWithDynamicDispatch$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupLambdaTarget):236:238 -> a
-    135:144:void processFieldRead(com.android.tools.r8.graph.DexField):257:266 -> a
-    145:145:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    145:145:void processFieldRead(com.android.tools.r8.graph.DexField):266 -> a
-    146:146:void processFieldRead(com.android.tools.r8.graph.DexField):266:266 -> a
-    147:147:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    147:147:void processFieldRead(com.android.tools.r8.graph.DexField):272 -> a
-    148:154:void processFieldRead(com.android.tools.r8.graph.DexField):273:279 -> a
-    1:2:void processFieldWrite(com.android.tools.r8.graph.DexField):285:286 -> b
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> b
-    3:3:void processFieldWrite(com.android.tools.r8.graph.DexField):287 -> b
-    4:4:void processFieldWrite(com.android.tools.r8.graph.DexField):289:289 -> b
-    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):378:378 -> registerCallSite
-    1:1:void processInitClass(com.android.tools.r8.graph.DexType):295:295 -> registerInitClass
-    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):305 -> registerInitClass
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> registerInitClass
-    2:2:void processInitClass(com.android.tools.r8.graph.DexType):295 -> registerInitClass
-    2:2:boolean registerInitClass(com.android.tools.r8.graph.DexType):305 -> registerInitClass
-    3:8:void processInitClass(com.android.tools.r8.graph.DexType):295:300 -> registerInitClass
-    3:8:boolean registerInitClass(com.android.tools.r8.graph.DexType):305 -> registerInitClass
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):341:341 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):347:347 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):317:317 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):329:329 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):323:323 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):335:335 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):311:311 -> registerInvokeVirtual
-    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):353:354 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):361:361 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):367:367 -> registerStaticFieldWrite
+    26:30:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):160:164 -> a
+    31:48:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:185 -> a
+    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():326:326 -> a
+    49:49:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185 -> a
+    50:50:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):186:186 -> a
+    51:57:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185:191 -> a
+    58:62:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):175:179 -> a
+    63:64:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198:199 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    65:65:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):199 -> a
+    66:115:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):201:250 -> a
+    116:120:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):217:221 -> a
+    121:127:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$processInvokeWithDynamicDispatch$2(boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):220:226 -> a
+    128:129:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):228:229 -> a
+    130:132:void lambda$processInvokeWithDynamicDispatch$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.LookupLambdaTarget):235:237 -> a
+    133:142:void processFieldRead(com.android.tools.r8.graph.DexField):256:265 -> a
+    143:143:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    143:143:void processFieldRead(com.android.tools.r8.graph.DexField):265 -> a
+    144:144:void processFieldRead(com.android.tools.r8.graph.DexField):265:265 -> a
+    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    145:145:void processFieldRead(com.android.tools.r8.graph.DexField):271 -> a
+    146:152:void processFieldRead(com.android.tools.r8.graph.DexField):272:278 -> a
+    1:2:void processFieldWrite(com.android.tools.r8.graph.DexField):284:285 -> b
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> b
+    3:3:void processFieldWrite(com.android.tools.r8.graph.DexField):286 -> b
+    4:4:void processFieldWrite(com.android.tools.r8.graph.DexField):288:288 -> b
+    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):377:377 -> registerCallSite
+    1:1:void processInitClass(com.android.tools.r8.graph.DexType):294:294 -> registerInitClass
+    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):304 -> registerInitClass
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> registerInitClass
+    2:2:void processInitClass(com.android.tools.r8.graph.DexType):294 -> registerInitClass
+    2:2:boolean registerInitClass(com.android.tools.r8.graph.DexType):304 -> registerInitClass
+    3:8:void processInitClass(com.android.tools.r8.graph.DexType):294:299 -> registerInitClass
+    3:8:boolean registerInitClass(com.android.tools.r8.graph.DexType):304 -> registerInitClass
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):340:340 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):346:346 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):316:316 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):328:328 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):322:322 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):334:334 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):310:310 -> registerInvokeVirtual
+    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):352:353 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):360:360 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):366:366 -> registerStaticFieldWrite
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.h:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -28480,135 +28770,135 @@
     1:1:void <clinit>():69:69 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):125:125 -> <init>
     2:46:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):84:128 -> <init>
-    1:2:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):186:187 -> a
-    3:20:void computeInitializers():191:208 -> a
-    3:20:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):132 -> a
-    21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):133:135 -> a
-    24:36:void rewriteNots():225:237 -> a
-    24:36:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    37:37:void rewriteNots():237 -> a
-    37:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
-    38:46:void rewriteNots():238:246 -> a
-    38:46:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
-    47:47:void rewriteNots():245:245 -> a
-    47:47:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
-    48:68:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137:157 -> a
-    69:106:void rewriteIincPatterns():361:398 -> a
-    69:106:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    107:107:int getLocalRegister(com.android.tools.r8.ir.code.Value):641:641 -> a
-    107:107:void rewriteIincPatterns():398 -> a
-    107:107:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    108:108:void rewriteIincPatterns():398:398 -> a
+    1:3:com.android.tools.r8.graph.DexField resolveField(com.android.tools.r8.graph.DexField):186:188 -> a
+    4:21:void computeInitializers():192:209 -> a
+    4:21:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):132 -> a
+    22:24:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):133:135 -> a
+    25:37:void rewriteNots():226:238 -> a
+    25:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
+    38:38:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    38:38:void rewriteNots():238 -> a
+    38:38:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
+    39:47:void rewriteNots():239:247 -> a
+    39:47:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
+    48:48:void rewriteNots():246:246 -> a
+    48:48:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):136 -> a
+    49:69:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137:157 -> a
+    70:107:void rewriteIincPatterns():362:399 -> a
+    70:107:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
+    108:108:int getLocalRegister(com.android.tools.r8.ir.code.Value):642:642 -> a
+    108:108:void rewriteIincPatterns():399 -> a
     108:108:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    109:109:int getLocalRegister(com.android.tools.r8.ir.code.Value):641:641 -> a
-    109:109:void rewriteIincPatterns():398 -> a
+    109:109:void rewriteIincPatterns():399:399 -> a
     109:109:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    110:128:void rewriteIincPatterns():399:417 -> a
-    110:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    129:129:void rewriteIincPatterns():395:395 -> a
-    129:129:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    130:130:void rewriteIincPatterns():390:390 -> a
+    110:110:int getLocalRegister(com.android.tools.r8.ir.code.Value):642:642 -> a
+    110:110:void rewriteIincPatterns():399 -> a
+    110:110:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
+    111:129:void rewriteIincPatterns():400:418 -> a
+    111:129:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
+    130:130:void rewriteIincPatterns():396:396 -> a
     130:130:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
-    131:132:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):162:163 -> a
-    133:151:com.android.tools.r8.graph.CfCode buildCfCode():261:279 -> a
-    133:151:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    152:196:com.android.tools.r8.cf.code.CfTryCatch com.android.tools.r8.cf.code.CfTryCatch.fromBuilder(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.CatchHandlers,com.android.tools.r8.ir.conversion.CfBuilder):0:44 -> a
-    152:196:com.android.tools.r8.graph.CfCode buildCfCode():281 -> a
-    152:196:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    197:223:com.android.tools.r8.graph.CfCode buildCfCode():280:306 -> a
-    197:223:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    224:224: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
-    224:224:com.android.tools.r8.graph.CfCode buildCfCode():306 -> a
-    224:224:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    225:226:com.android.tools.r8.graph.CfCode buildCfCode():306:307 -> a
-    225:226:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    227:229:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):253:255 -> a
-    227:229:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
-    227:229:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    230:231:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):120:121 -> a
-    230:231:com.android.tools.r8.graph.CfCode buildCfCode():310 -> a
-    230:231:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    232:232:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):424:424 -> a
-    232:232:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    232:232:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    233:233:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):352:352 -> a
-    233:233:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):425 -> a
-    233:233:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
+    131:131:void rewriteIincPatterns():391:391 -> a
+    131:131:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):160 -> a
+    132:133:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):162:163 -> a
+    134:152:com.android.tools.r8.graph.CfCode buildCfCode():262:280 -> a
+    134:152:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    153:197:com.android.tools.r8.cf.code.CfTryCatch com.android.tools.r8.cf.code.CfTryCatch.fromBuilder(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.CatchHandlers,com.android.tools.r8.ir.conversion.CfBuilder):0:44 -> a
+    153:197:com.android.tools.r8.graph.CfCode buildCfCode():282 -> a
+    153:197:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    198:224:com.android.tools.r8.graph.CfCode buildCfCode():281:307 -> a
+    198:224:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    225:225: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
+    225:225:com.android.tools.r8.graph.CfCode buildCfCode():307 -> a
+    225:225:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    226:227:com.android.tools.r8.graph.CfCode buildCfCode():307:308 -> a
+    226:227:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    228:230:int stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):254:256 -> a
+    228:230:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
+    228:230:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    231:232:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):120:121 -> a
+    231:232:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
+    231:232:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    233:233:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):425:425 -> a
+    233:233:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
     233:233:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    234:238:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):341:345 -> a
-    234:238:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):353 -> a
-    234:238:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):425 -> a
-    234:238:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    234:238:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    239:241:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):429:431 -> a
-    239:241:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    239:241:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    242:275:void addFrame(com.android.tools.r8.ir.code.BasicBlock):543:576 -> a
-    242:275:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):431 -> a
-    242:275:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    242:275:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    276:286:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):432:442 -> a
-    276:286:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    276:286:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    287:288:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):115:116 -> a
-    287:288:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):442 -> a
-    287:288:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    287:288:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    289:306:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):445:462 -> a
-    289:306:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    289:306:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    307:324:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):471:488 -> a
-    307:324:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):464 -> a
-    307:324:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    307:324:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    325:325:void add(com.android.tools.r8.cf.code.CfInstruction):645:645 -> a
-    325:325:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):488 -> a
-    325:325:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):464 -> a
-    325:325:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
-    325:325:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    326:326:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):489:489 -> a
-    326:326:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):464 -> a
-    326:326:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
+    234:234:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):353:353 -> a
+    234:234:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426 -> a
+    234:234:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    234:234:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    235:239:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):342:346 -> a
+    235:239:boolean hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):354 -> a
+    235:239:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):426 -> a
+    235:239:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    235:239:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    240:242:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):430:432 -> a
+    240:242:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    240:242:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    243:276:void addFrame(com.android.tools.r8.ir.code.BasicBlock):544:577 -> a
+    243:276:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):432 -> a
+    243:276:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    243:276:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    277:287:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):433:443 -> a
+    277:287:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    277:287:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    288:289:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):115:116 -> a
+    288:289:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):443 -> a
+    288:289:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    288:289:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    290:307:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):446:463 -> a
+    290:307:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    290:307:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    308:325:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):472:489 -> a
+    308:325:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):465 -> a
+    308:325:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
+    308:325:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    326:326:void add(com.android.tools.r8.cf.code.CfInstruction):646:646 -> a
+    326:326:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):489 -> a
+    326:326:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):465 -> a
+    326:326:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
     326:326:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    327:327:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):465:465 -> a
-    327:327:com.android.tools.r8.graph.CfCode buildCfCode():311 -> a
+    327:327:void updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):490:490 -> a
+    327:327:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):465 -> a
+    327:327:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
     327:327:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    328:328:com.android.tools.r8.graph.CfCode buildCfCode():313:313 -> a
+    328:328:void buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):466:466 -> a
+    328:328:com.android.tools.r8.graph.CfCode buildCfCode():312 -> a
     328:328:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    329:329:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():105:105 -> a
-    329:329:com.android.tools.r8.graph.CfCode buildCfCode():313 -> a
+    329:329:com.android.tools.r8.graph.CfCode buildCfCode():314:314 -> a
     329:329:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    330:350:com.android.tools.r8.graph.CfCode buildCfCode():313:333 -> a
-    330:350:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
-    351:351:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165:165 -> a
-    352:359:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):170:177 -> a
-    352:359:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    360:360:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    360:360:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):177 -> a
-    360:360:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    361:361:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):178:178 -> a
+    330:330:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():105:105 -> a
+    330:330:com.android.tools.r8.graph.CfCode buildCfCode():314 -> a
+    330:330:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    331:351:com.android.tools.r8.graph.CfCode buildCfCode():314:334 -> a
+    331:351:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):164 -> a
+    352:352:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165:165 -> a
+    353:360:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):170:177 -> a
+    353:360:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    361:361:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    361:361:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):177 -> a
     361:361:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    362:368:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):212:218 -> a
-    369:369:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():539:539 -> a
-    369:369:com.android.tools.r8.cf.code.CfLabel ensureLabel():529 -> a
-    370:373:com.android.tools.r8.cf.code.CfLabel ensureLabel():530:533 -> a
-    374:374:void add(com.android.tools.r8.cf.code.CfInstruction):645:645 -> a
-    374:374:com.android.tools.r8.cf.code.CfLabel ensureLabel():534 -> a
-    375:376:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580:581 -> a
-    377:407:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):590:620 -> a
-    377:407:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):583 -> a
-    408:408:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):584:584 -> a
-    409:409:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):597:597 -> a
-    409:409:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):583 -> a
-    410:412:void emitLabel(com.android.tools.r8.cf.code.CfLabel):628:630 -> a
-    413:413:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):637:637 -> a
-    414:414:void add(com.android.tools.r8.cf.code.CfInstruction):645:645 -> a
-    1:20:void updateLocals(com.android.tools.r8.cf.code.CfLabel):494:513 -> b
-    21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):512:517 -> b
-    27:30:boolean localsChanged():521:524 -> b
-    31:31:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):637:637 -> b
-    32:32:int getLocalRegister(com.android.tools.r8.ir.code.Value):641:641 -> b
+    362:362:boolean verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):178:178 -> a
+    362:362:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    363:369:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):213:219 -> a
+    370:370:com.android.tools.r8.cf.code.CfInstruction getLastInstruction():540:540 -> a
+    370:370:com.android.tools.r8.cf.code.CfLabel ensureLabel():530 -> a
+    371:374:com.android.tools.r8.cf.code.CfLabel ensureLabel():531:534 -> a
+    375:375:void add(com.android.tools.r8.cf.code.CfInstruction):646:646 -> a
+    375:375:com.android.tools.r8.cf.code.CfLabel ensureLabel():535 -> a
+    376:377:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):581:582 -> a
+    378:408:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):591:621 -> a
+    378:408:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):584 -> a
+    409:409:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):585:585 -> a
+    410:410:com.android.tools.r8.cf.code.CfFrame$FrameType findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):598:598 -> a
+    410:410:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):584 -> a
+    411:413:void emitLabel(com.android.tools.r8.cf.code.CfLabel):629:631 -> a
+    414:414:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):638:638 -> a
+    415:415:void add(com.android.tools.r8.cf.code.CfInstruction):646:646 -> a
+    1:20:void updateLocals(com.android.tools.r8.cf.code.CfLabel):495:514 -> b
+    21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):513:518 -> b
+    27:30:boolean localsChanged():522:525 -> b
+    31:31:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):638:638 -> b
+    32:32:int getLocalRegister(com.android.tools.r8.ir.code.Value):642:642 -> b
 com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.ir.conversion.j:
 com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.ir.conversion.k:
     int height -> b
@@ -28651,7 +28941,7 @@
     1:1:int instructionCount():267:267 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):295:299 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):304:306 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):306 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):306:306 -> a
     15:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):308:332 -> a
@@ -28681,7 +28971,7 @@
     195:195:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):398:398 -> a
     196:196:com.android.tools.r8.graph.DexEncodedMethod getMethod():254:254 -> a
     196:196:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):401 -> a
-    197:197:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():265:265 -> a
+    197:197:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():262:262 -> a
     197:197:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):401 -> a
     198:210:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):401:413 -> a
     211:213:void buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):429:431 -> a
@@ -28934,7 +29224,7 @@
     1:1:int maxLocal():496:496 -> b
     1:1:java.lang.String toString():512:512 -> toString
 com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.ir.conversion.z:
-    void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
+    void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId) -> a
 com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.ir.conversion.K:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
@@ -29006,48 +29296,48 @@
     197:200:void reset():165:168 -> a
     197:200:com.android.tools.r8.graph.DexCode build():191 -> a
     201:242:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    243:243:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1464:1464 -> a
+    243:243:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1498:1498 -> a
     243:243:com.android.tools.r8.graph.DexCode build():237 -> a
     244:287:com.android.tools.r8.graph.DexCode build():238:281 -> a
     288:307:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):711:730 -> a
     288:307:com.android.tools.r8.graph.DexCode build():284 -> a
     308:322:com.android.tools.r8.graph.DexCode build():285:299 -> a
-    323:374:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():0:51 -> a
-    323:374:com.android.tools.r8.graph.DexCode build():299 -> a
-    375:378:com.android.tools.r8.graph.DexCode build():300:303 -> a
-    379:381:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():737:739 -> a
-    379:381:com.android.tools.r8.graph.DexCode build():307 -> a
-    382:387:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):840:845 -> a
-    382:387:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():741 -> a
-    382:387:com.android.tools.r8.graph.DexCode build():307 -> a
-    388:388:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742:742 -> a
-    388:388:com.android.tools.r8.graph.DexCode build():307 -> a
-    389:406:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):851:868 -> a
-    389:406:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742 -> a
-    389:406:com.android.tools.r8.graph.DexCode build():307 -> a
-    407:415:com.android.tools.r8.graph.DexCode build():310:318 -> a
-    416:417:void requestOutgoingRegisters(int):514:515 -> a
-    418:418:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):520:520 -> a
-    419:422:void addGoto(com.android.tools.r8.ir.code.Goto):530:533 -> a
-    423:437:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):538:552 -> a
-    423:437:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562 -> a
-    438:440:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):563:565 -> a
-    441:442:void addIf(com.android.tools.r8.ir.code.If):570:571 -> a
-    443:443:void addMove(com.android.tools.r8.ir.code.Move):575:575 -> a
+    323:373:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():0:50 -> a
+    323:373:com.android.tools.r8.graph.DexCode build():299 -> a
+    374:377:com.android.tools.r8.graph.DexCode build():300:303 -> a
+    378:380:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():737:739 -> a
+    378:380:com.android.tools.r8.graph.DexCode build():307 -> a
+    381:386:com.android.tools.r8.graph.DexCode$Try[] getDexTryItems(java.util.List,java.util.Map):840:845 -> a
+    381:386:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():741 -> a
+    381:386:com.android.tools.r8.graph.DexCode build():307 -> a
+    387:387:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742:742 -> a
+    387:387:com.android.tools.r8.graph.DexCode build():307 -> a
+    388:405:com.android.tools.r8.graph.DexCode$TryHandler[] getDexTryHandlers(java.util.Map):851:868 -> a
+    388:405:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo computeTryInfo():742 -> a
+    388:405:com.android.tools.r8.graph.DexCode build():307 -> a
+    406:414:com.android.tools.r8.graph.DexCode build():310:318 -> a
+    415:416:void requestOutgoingRegisters(int):514:515 -> a
+    417:417:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):520:520 -> a
+    418:421:void addGoto(com.android.tools.r8.ir.code.Goto):530:533 -> a
+    422:436:boolean needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):538:552 -> a
+    422:436:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562 -> a
+    437:439:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):563:565 -> a
+    440:441:void addIf(com.android.tools.r8.ir.code.If):570:571 -> a
+    442:442:void addMove(com.android.tools.r8.ir.code.Move):575:575 -> a
+    443:443:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
+    443:443:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):604 -> a
     444:444:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    444:444:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):604 -> a
-    445:445:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    446:447:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):608:609 -> a
-    448:449:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):613:614 -> a
-    450:452:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):618:620 -> a
-    453:454:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):624:625 -> a
-    455:456:void addArgument(com.android.tools.r8.ir.code.Argument):629:630 -> a
-    457:461:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):634:638 -> a
-    462:473:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):682:693 -> a
-    474:479:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):701:706 -> a
-    474:479:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694 -> a
-    480:483:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694:697 -> a
-    484:558:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):748:822 -> a
+    445:446:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):608:609 -> a
+    447:448:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):613:614 -> a
+    449:451:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):618:620 -> a
+    452:453:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):624:625 -> a
+    454:455:void addArgument(com.android.tools.r8.ir.code.Argument):629:630 -> a
+    456:460:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):634:638 -> a
+    461:472:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):682:693 -> a
+    473:478:com.android.tools.r8.ir.code.BasicBlock computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):701:706 -> a
+    473:478:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694 -> a
+    479:482:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694:697 -> a
+    483:557:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):748:822 -> a
     1:1:void needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):510:510 -> b
     1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
     2:2:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):526:526 -> b
@@ -29602,7 +29892,7 @@
     426:426:com.android.tools.r8.graph.DexEncodedMethod getMethod():489:489 -> a
     426:426:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):708 -> a
     427:433:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):708:714 -> a
-    434:434:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1211:1211 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1245:1245 -> a
     434:434:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):714 -> a
     435:435:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):715:715 -> a
     436:447:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
@@ -29644,7 +29934,7 @@
     482:482:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):964 -> a
     483:483:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):965:965 -> a
     484:488:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1020:1024 -> a
-    489:489:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():622:622 -> a
+    489:489:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():627:627 -> a
     489:489:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):997 -> a
     489:489:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1025 -> a
     490:490:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):997:997 -> a
@@ -29685,7 +29975,7 @@
     606:606:void addConstString(int,com.android.tools.r8.graph.DexString):1214:1214 -> a
     607:607:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1208:1208 -> a
     607:607:void addConstString(int,com.android.tools.r8.graph.DexString):1215 -> a
-    608:608:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
+    608:608:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
     608:608:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1208 -> a
     608:608:void addConstString(int,com.android.tools.r8.graph.DexString):1215 -> a
     609:610:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1209:1210 -> a
@@ -29694,7 +29984,7 @@
     612:612:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1221:1221 -> a
     613:613:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1208:1208 -> a
     613:613:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1222 -> a
-    614:614:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
+    614:614:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
     614:614:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1208 -> a
     614:614:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1222 -> a
     615:616:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1209:1210 -> a
@@ -29861,7 +30151,7 @@
     1205:1205:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2257:2257 -> a
     1205:1205:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2058 -> a
     1206:1210:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2059:2063 -> a
-    1211:1211:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():622:622 -> a
+    1211:1211:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():627:627 -> a
     1211:1211:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2063 -> a
     1212:1222:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2064:2074 -> a
     1223:1227:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2072:2076 -> a
@@ -29984,7 +30274,7 @@
     82:85:void addTrivialIf(int,int):1347:1350 -> b
     86:89:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1438:1441 -> b
     90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1604:1604 -> b
-    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> b
+    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> b
     91:91:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1604 -> b
     92:98:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1604:1610 -> b
     99:103:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1737:1741 -> b
@@ -30388,393 +30678,387 @@
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
     1:1:void <clinit>():127:127 -> <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):197:197 -> <init>
-    2:212: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):171:381 -> <init>
-    213:213:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):386:386 -> <init>
-    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    2:209: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):171:378 -> <init>
+    210:210:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):383:383 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$19(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):219:219 -> a
     2:330:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):0:328 -> a
     2:330:java.lang.String lambda$new$0(java.lang.String):219 -> a
     331:331:java.lang.String lambda$new$0(java.lang.String):219:219 -> a
-    332:333:void removeLambdaDeserializationMethods():413:414 -> a
-    332:333:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):494 -> a
-    334:339:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):496:501 -> a
-    340:341:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):420:421 -> a
-    340:341:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):503 -> a
-    342:342:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):504:504 -> a
-    343:344:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):451:452 -> a
-    343:344:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):505 -> a
-    345:346:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):460:461 -> a
-    345:346:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):506 -> a
-    347:348:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):467:468 -> a
-    347:348:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):507 -> a
-    349:350:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):474:475 -> a
-    349:350:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):508 -> a
-    351:352:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):487:488 -> a
-    351:352:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):510 -> a
-    353:354:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):959:960 -> a
-    353:354:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):511 -> a
-    355:358:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):513:516 -> a
-    359:361:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):427:429 -> a
-    362:368:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):520:526 -> a
-    369:371:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):551:553 -> a
-    369:371:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):527 -> a
-    372:379:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):120:127 -> a
-    372:379:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):553 -> a
-    372:379:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):527 -> a
-    380:380:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):552:552 -> a
-    380:380:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):527 -> a
-    381:383:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.ProgramMethod):600:602 -> a
-    384:413:void convertMethod(com.android.tools.r8.graph.ProgramMethod):607:636 -> a
-    414:414:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    414:414:void convertMethod(com.android.tools.r8.graph.ProgramMethod):636 -> a
-    415:415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    415:415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    415:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod):636 -> a
-    416:420:void convertMethod(com.android.tools.r8.graph.ProgramMethod):636:640 -> a
-    421:421:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    421:421:void convertMethod(com.android.tools.r8.graph.ProgramMethod):640 -> a
-    422:428:void convertMethod(com.android.tools.r8.graph.ProgramMethod):640:646 -> a
-    429:431:void convertMethod(com.android.tools.r8.graph.ProgramMethod):643:643 -> a
-    436:436:void convertMethod(com.android.tools.r8.graph.ProgramMethod):648:648 -> a
-    437:437:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    437:437:void convertMethod(com.android.tools.r8.graph.ProgramMethod):648 -> a
-    438:442:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1736:1740 -> a
-    438:442:void convertMethod(com.android.tools.r8.graph.ProgramMethod):649 -> a
-    443:445:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):665:667 -> a
-    446:447:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):939:940 -> a
-    446:447:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):668 -> a
-    448:449:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):441:442 -> a
-    448:449:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):669 -> a
-    450:461:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):677:688 -> a
-    462:526:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):687:751 -> a
-    527:527:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    527:527:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):751 -> a
-    528:528:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:752 -> a
-    529:530:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):435:436 -> a
-    529:530:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):754 -> a
-    531:544:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):755:768 -> a
-    545:546:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):451:452 -> a
-    545:546:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):769 -> a
-    547:549:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):770:772 -> a
-    550:551:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):460:461 -> a
-    550:551:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):773 -> a
-    552:553:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):467:468 -> a
-    552:553:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):774 -> a
-    554:555:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):474:475 -> a
-    554:555:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):775 -> a
-    556:556:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):776:776 -> a
-    557:558:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):481:482 -> a
-    557:558:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):777 -> a
-    559:559:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):779:779 -> a
-    560:561: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):950:951 -> a
-    560:561:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):781 -> a
-    562:562:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):783:783 -> a
-    563:564:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):959:960 -> a
-    563:564:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):784 -> a
-    565:568:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):786:789 -> a
-    569:588:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):788:807 -> a
-    589:596:com.android.tools.r8.graph.DexType computeOutlineClassType():1002:1009 -> a
-    589:596:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):807 -> a
-    597:649:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):807:859 -> a
-    650:652:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):858:860 -> a
-    653:653:com.android.tools.r8.utils.Timing lambda$optimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod):695:695 -> a
-    654:655:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):803:804 -> a
-    656:663:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):868:875 -> a
-    664:664:void addWaveDoneAction(com.android.tools.r8.utils.Action):879:879 -> a
-    665:665:boolean isInWave():889:889 -> a
-    665:665:void addWaveDoneAction(com.android.tools.r8.utils.Action):882 -> a
-    666:666:void addWaveDoneAction(com.android.tools.r8.utils.Action):885:885 -> a
-    667:667:void addWaveDoneAction(com.android.tools.r8.utils.Action):883:883 -> a
-    668:668:void addWaveDoneAction(com.android.tools.r8.utils.Action):880:880 -> a
-    669:669:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):893:893 -> a
-    670:670:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):895:895 -> a
-    671:673:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):903:905 -> a
-    674:674:void forEachSelectedOutliningMethod(java.util.function.Consumer,java.util.concurrent.ExecutorService):904:904 -> a
-    675:685:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):907:917 -> a
-    686:686:void clearDexMethodCompilationState():965:965 -> a
-    687:687:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):969:969 -> a
-    688:699:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):982:993 -> a
-    700:700:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1052:1052 -> a
-    700:700:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):993 -> a
-    701:701:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):993:993 -> a
-    702:702:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):992:992 -> a
-    703:706:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):1016:1019 -> a
-    707:711:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1025:1029 -> a
-    712:714:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):1044:1046 -> a
-    715:715:void lambda$processMethodsConcurrently$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod):1047:1047 -> a
-    716:716:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1052:1052 -> a
-    717:719:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1098:1100 -> a
-    717:719:com.android.tools.r8.utils.Timing lambda$rewriteCode$12(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1093 -> a
-    720:728:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1099:1107 -> a
-    720:728:com.android.tools.r8.utils.Timing lambda$rewriteCode$12(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1093 -> a
-    729:744:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1103:1118 -> a
-    729:744:com.android.tools.r8.utils.Timing lambda$rewriteCode$12(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1093 -> a
-    745:753:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1124:1132 -> a
-    754:759:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1944:1949 -> a
-    754:759:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1135 -> a
-    760:766:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1136:1142 -> a
-    767:767:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1416:1416 -> a
-    767:767:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1142 -> a
-    768:788:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1143:1163 -> a
-    789:815:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1162:1188 -> a
-    816:816:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1671:1671 -> a
-    816:816:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1189 -> a
-    817:817:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    817:817:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1671 -> a
-    817:817:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1189 -> a
-    818:820:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1671:1673 -> a
-    818:820:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1189 -> a
-    821:821:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    821:821:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1673 -> a
-    821:821:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1189 -> a
-    822:825:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1674:1677 -> a
-    822:825:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1189 -> a
-    826:840:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1197:1211 -> a
-    841:841:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):95:95 -> a
-    841:841:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1211 -> a
-    842:879:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1212:1249 -> a
-    880:880:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):878:878 -> a
-    880:880:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1249 -> a
-    881:881:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):873:873 -> a
-    881:881:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1249 -> a
-    882:978:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1250:1346 -> a
-    979:979:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-    979:979:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1346 -> a
-    980:980:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954:954 -> a
-    980:980:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2386 -> a
-    980:980:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1346 -> a
-    981:981:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387:2387 -> a
-    981:981:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1346 -> a
-    982:992:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1347:1357 -> a
-    993:1072:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:79 -> a
-    993:1072:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1357 -> a
-    1073:1078:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1358:1363 -> a
-    1079:1081:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1081:1083 -> a
-    1079:1081:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1364 -> a
-    1082:1094:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1368:1380 -> a
-    1095:1149:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1379:1433 -> a
-    1150:1246:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1423:1519 -> a
-    1247:1247:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    1247:1247:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1519 -> a
-    1248:1267:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1520:1539 -> a
-    1268:1273:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):959:964 -> a
-    1268:1273:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1539 -> a
-    1274:1316:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1540:1582 -> a
-    1317:1317:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1424:1424 -> a
-    1317:1317:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1582 -> a
-    1318:1326:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1583:1591 -> a
-    1327:1327:void lambda$optimize$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1238:1238 -> a
-    1328:1328:void lambda$optimize$14(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1242:1242 -> a
-    1329:1331:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$15(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1435:1435 -> a
-    1332:1363:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1604:1635 -> a
-    1364:1369:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1634:1639 -> a
-    1370:1375:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1638:1643 -> a
-    1376:1376:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1642:1642 -> a
-    1377:1378:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1661:1662 -> a
-    1379:1379:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    1379:1379:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1662 -> a
-    1380:1385:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681:1686 -> a
-    1380:1385:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1663 -> a
-    1386:1386:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1665:1665 -> a
-    1387:1394:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1690:1697 -> a
-    1387:1394:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1395:1399:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1736:1740 -> a
-    1395:1399:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1698 -> a
-    1395:1399:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1400:1402:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699:1701 -> a
-    1400:1402:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1403:1403:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1052:1052 -> a
-    1403:1403:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1701 -> a
-    1403:1403:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1404:1404:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1701:1701 -> a
-    1404:1404:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1405:1411:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1700:1706 -> a
-    1405:1411:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1666 -> a
-    1412:1412:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1711:1711 -> a
-    1413:1422:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1720:1729 -> a
-    1413:1422:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1713 -> a
-    1423:1425:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1714:1716 -> a
-    1426:1433:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1749:1756 -> a
-    1434:1434:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1449:1449 -> a
-    1434:1434:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1756 -> a
-    1435:1435:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1757:1757 -> a
-    1436:5138:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):0:3702 -> a
-    1436:5138:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1757 -> a
-    5139:5139:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1574:1574 -> a
-    5139:5139:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3703 -> a
-    5139:5139:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1757 -> a
-    5140:5141:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3703:3704 -> a
-    5140:5141:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1757 -> a
-    5142:5155:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1759:1772 -> a
-    5156:5156:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1771:1771 -> a
-    5157:5158:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$17(com.android.tools.r8.graph.DexItemFactory):1837:1838 -> a
-    5159:5159:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$17(com.android.tools.r8.graph.DexItemFactory):1836:1836 -> a
-    5160:5160:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1884:1884 -> a
-    5161:5161:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1960:1960 -> a
-    5162:5162:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    5162:5162:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1961 -> a
-    5163:5180:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1962:1979 -> a
-    1:7:boolean enableTryWithResourcesDesugaring():403:409 -> b
-    8:13:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):532:537 -> b
-    14:25:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):535:546 -> b
-    26:35:void convertMethods(com.android.tools.r8.graph.DexProgramClass):588:597 -> b
-    36:36:boolean lambda$convertMethods$3(com.android.tools.r8.graph.DexEncodedMethod):598:598 -> b
-    37:40:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):812:815 -> b
-    41:41:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):814:814 -> b
+    332:333:void removeLambdaDeserializationMethods():410:411 -> a
+    332:333:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):491 -> a
+    334:339:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):493:498 -> a
+    340:341:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):417:418 -> a
+    340:341:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):500 -> a
+    342:343:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):501:502 -> a
+    344:345:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):448:449 -> a
+    344:345:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):502 -> a
+    346:347:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):457:458 -> a
+    346:347:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):503 -> a
+    348:349:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):464:465 -> a
+    348:349:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):504 -> a
+    350:351:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):471:472 -> a
+    350:351:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):505 -> a
+    352:353:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):484:485 -> a
+    352:353:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):507 -> a
+    354:355:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):961:962 -> a
+    354:355:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):508 -> a
+    356:359:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):510:513 -> a
+    360:362:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:426 -> a
+    363:369:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):517:523 -> a
+    370:372:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):548:550 -> a
+    370:372:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):524 -> a
+    373:380:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):120:127 -> a
+    373:380:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):550 -> a
+    373:380:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):524 -> a
+    381:381:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):549:549 -> a
+    381:381:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):524 -> a
+    382:384:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.ProgramMethod):597:599 -> a
+    385:414:void convertMethod(com.android.tools.r8.graph.ProgramMethod):604:633 -> a
+    415:415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    415:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod):633 -> a
+    416:416:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    416:416:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    416:416:void convertMethod(com.android.tools.r8.graph.ProgramMethod):633 -> a
+    417:421:void convertMethod(com.android.tools.r8.graph.ProgramMethod):633:637 -> a
+    422:422:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    422:422:void convertMethod(com.android.tools.r8.graph.ProgramMethod):637 -> a
+    423:432:void convertMethod(com.android.tools.r8.graph.ProgramMethod):637:646 -> a
+    433:437:void convertMethod(com.android.tools.r8.graph.ProgramMethod):640:640 -> a
+    445:445:void convertMethod(com.android.tools.r8.graph.ProgramMethod):648:648 -> a
+    446:446:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    446:446:void convertMethod(com.android.tools.r8.graph.ProgramMethod):648 -> a
+    447:451:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1769:1773 -> a
+    447:451:void convertMethod(com.android.tools.r8.graph.ProgramMethod):649 -> a
+    452:454:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):665:667 -> a
+    455:456:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):941:942 -> a
+    455:456:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):668 -> a
+    457:458:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):438:439 -> a
+    457:458:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):669 -> a
+    459:470:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):677:688 -> a
+    471:535:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):687:751 -> a
+    536:536:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    536:536:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):751 -> a
+    537:537:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:752 -> a
+    538:539:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):432:433 -> a
+    538:539:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):754 -> a
+    540:554:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):755:769 -> a
+    555:556:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):448:449 -> a
+    555:556:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):769 -> a
+    557:559:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):770:772 -> a
+    560:561:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):457:458 -> a
+    560:561:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):773 -> a
+    562:563:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):464:465 -> a
+    562:563:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):774 -> a
+    564:565:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):471:472 -> a
+    564:565:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):775 -> a
+    566:566:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):776:776 -> a
+    567:568:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):478:479 -> a
+    567:568:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):777 -> a
+    569:569:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):779:779 -> a
+    570:571: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):952:953 -> a
+    570:571:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):781 -> a
+    572:572:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):783:783 -> a
+    573:574:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):961:962 -> a
+    573:574:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):784 -> a
+    575:578:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):786:789 -> a
+    579:600:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):788:809 -> a
+    601:608:com.android.tools.r8.graph.DexType computeOutlineClassType():1004:1011 -> a
+    601:608:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):809 -> a
+    609:659:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):809:859 -> a
+    660:662:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):858:860 -> a
+    663:663:com.android.tools.r8.utils.Timing lambda$optimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):696:696 -> a
+    664:665:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):805:806 -> a
+    666:673:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):868:875 -> a
+    674:674:void addWaveDoneAction(com.android.tools.r8.utils.Action):879:879 -> a
+    675:675:boolean isInWave():889:889 -> a
+    675:675:void addWaveDoneAction(com.android.tools.r8.utils.Action):882 -> a
+    676:676:void addWaveDoneAction(com.android.tools.r8.utils.Action):885:885 -> a
+    677:677:void addWaveDoneAction(com.android.tools.r8.utils.Action):883:883 -> a
+    678:678:void addWaveDoneAction(com.android.tools.r8.utils.Action):880:880 -> a
+    679:679:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):893:893 -> a
+    680:680:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):895:895 -> a
+    681:682:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):905:906 -> a
+    683:693:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):909:919 -> a
+    694:694:void clearDexMethodCompilationState():967:967 -> a
+    695:695:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):971:971 -> a
+    696:707:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):984:995 -> a
+    708:708:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1058:1058 -> a
+    708:708:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):995 -> a
+    709:709:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):995:995 -> a
+    710:710:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):994:994 -> a
+    711:712:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):1019:1020 -> a
+    713:717:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1026:1030 -> a
+    718:718:void lambda$optimizeSynthesizedMethod$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1040:1040 -> a
+    719:721:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1047:1049 -> a
+    722:722:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1058:1058 -> a
+    723:725:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1113:1115 -> a
+    723:725:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1105 -> a
+    726:734:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1114:1122 -> a
+    726:734:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1105 -> a
+    735:753:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1118:1136 -> a
+    735:753:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1105 -> a
+    754:762:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1145:1153 -> a
+    763:768:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1977:1982 -> a
+    763:768:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1156 -> a
+    769:775:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1157:1163 -> a
+    776:776:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1450:1450 -> a
+    776:776:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1163 -> a
+    777:797:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1164:1184 -> a
+    798:824:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1183:1209 -> a
+    825:825:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1704 -> a
+    825:825:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1210 -> a
+    826:826:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    826:826:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704 -> a
+    826:826:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1210 -> a
+    827:829:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1706 -> a
+    827:829:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1210 -> a
+    830:830:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    830:830:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1706 -> a
+    830:830:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1210 -> a
+    831:834:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1707:1710 -> a
+    831:834:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1210 -> a
+    835:843:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1218:1226 -> a
+    844:861:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1225:1242 -> a
+    862:862:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):95:95 -> a
+    862:862:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1242 -> a
+    863:900:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1243:1280 -> a
+    901:901:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):865:865 -> a
+    901:901:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1280 -> a
+    902:902:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):859:859 -> a
+    902:902:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1280 -> a
+    903:1001:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1281:1379 -> a
+    1002:1002:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+    1002:1002:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1379 -> a
+    1003:1003:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965:965 -> a
+    1003:1003:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2410 -> a
+    1003:1003:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1379 -> a
+    1004:1004:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2411:2411 -> a
+    1004:1004:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1379 -> a
+    1005:1015:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1380:1390 -> a
+    1016:1095:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:79 -> a
+    1016:1095:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1390 -> a
+    1096:1101:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1391:1396 -> a
+    1102:1104:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1090:1092 -> a
+    1102:1104:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1397 -> a
+    1105:1117:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1401:1413 -> a
+    1118:1172:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1412:1466 -> a
+    1173:1269:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1456:1552 -> a
+    1270:1270:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1270:1270:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1552 -> a
+    1271:1290:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1553:1572 -> a
+    1291:1296:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):957:962 -> a
+    1291:1296:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1572 -> a
+    1297:1339:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1573:1615 -> a
+    1340:1340:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1458:1458 -> a
+    1340:1340:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1615 -> a
+    1341:1349:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1616:1624 -> a
+    1350:1350:void lambda$optimize$14(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1269:1269 -> a
+    1351:1351:void lambda$optimize$15(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1273:1273 -> a
+    1352:1354:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1468:1468 -> a
+    1355:1394:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1637:1676 -> a
+    1395:1395:void collectOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1675:1675 -> a
+    1396:1397:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1694:1695 -> a
+    1398:1398:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1398:1398:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1695 -> a
+    1399:1404:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1714:1719 -> a
+    1399:1404:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1696 -> a
+    1405:1405:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1698:1698 -> a
+    1406:1413:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1723:1730 -> a
+    1406:1413:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1414:1418:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1769:1773 -> a
+    1414:1418:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1731 -> a
+    1414:1418:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1419:1421:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1732:1734 -> a
+    1419:1421:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1422:1422:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1058:1058 -> a
+    1422:1422:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1734 -> a
+    1422:1422:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1423:1423:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1734:1734 -> a
+    1423:1423:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1424:1430:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1733:1739 -> a
+    1424:1430:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1431:1431:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1744:1744 -> a
+    1432:1441:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1753:1762 -> a
+    1432:1441:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1746 -> a
+    1442:1444:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1747:1749 -> a
+    1445:1452:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1782:1789 -> a
+    1453:1453:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1483:1483 -> a
+    1453:1453:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1789 -> a
+    1454:1454:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790:1790 -> a
+    1455:5181:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):0:3726 -> a
+    1455:5181:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5182:5182:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1574:1574 -> a
+    5182:5182:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3727 -> a
+    5182:5182:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5183:5184:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3727:3728 -> a
+    5183:5184:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5185:5198:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1792:1805 -> a
+    5199:5199:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1804:1804 -> a
+    5200:5201:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1870:1871 -> a
+    5202:5202:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$18(com.android.tools.r8.graph.DexItemFactory):1869:1869 -> a
+    5203:5203:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1917:1917 -> a
+    5204:5204:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1993:1993 -> a
+    5205:5205:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    5205:5205:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1994 -> a
+    5206:5223:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1995:2012 -> a
+    1:7:boolean enableTryWithResourcesDesugaring():400:406 -> b
+    8:13:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):529:534 -> b
+    14:25:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):532:543 -> b
+    26:35:void convertMethods(com.android.tools.r8.graph.DexProgramClass):585:594 -> b
+    36:36:boolean lambda$convertMethods$3(com.android.tools.r8.graph.DexEncodedMethod):595:595 -> b
+    37:40:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):815:818 -> b
+    41:41:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):817:817 -> b
     42:42:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):864:864 -> b
-    43:43:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):924:924 -> b
-    44:48:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):931:935 -> b
-    49:49:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):934:934 -> b
-    50:59:com.android.tools.r8.utils.Timing processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1068:1077 -> b
-    60:64:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1653:1657 -> b
-    65:69:boolean lambda$workaroundForwardingInitializerBug$16(com.android.tools.r8.ir.code.Instruction):1800:1804 -> b
-    70:71:void printPhase(java.lang.String):1954:1955 -> b
-    1:1:boolean enableTwrCloseResourceDesugaring():399:399 -> c
-    2:21:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):559:578 -> c
-    22:28:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):577:583 -> c
+    43:43:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):927:927 -> b
+    44:44:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):926:926 -> b
+    45:49:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):933:937 -> b
+    50:50:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):936:936 -> b
+    51:51:void lambda$processMethodsConcurrently$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1051:1051 -> b
+    52:61:com.android.tools.r8.utils.Timing processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1077:1086 -> b
+    62:66:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1686:1690 -> b
+    67:71:boolean lambda$workaroundForwardingInitializerBug$17(com.android.tools.r8.ir.code.Instruction):1833:1837 -> b
+    72:73:void printPhase(java.lang.String):1987:1988 -> b
+    1:1:boolean enableTwrCloseResourceDesugaring():396:396 -> c
+    2:21:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):556:575 -> c
+    22:28:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):574:580 -> c
     29:42:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):143:156 -> c
-    29:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):583 -> c
-    43:43:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):583:583 -> c
+    29:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):580 -> c
+    43:43:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):580:580 -> c
     44:45:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):894:895 -> c
-    46:51:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1033:1038 -> c
-    52:52:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1035:1035 -> c
-    53:54:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1091:1092 -> c
-    55:55:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):141:141 -> c
-    55:55:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1090 -> c
-    56:56:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1090:1090 -> c
-    57:57:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):145:145 -> c
-    57:57:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1090 -> c
-    58:58:java.lang.Object com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):143:143 -> c
-    58:58:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):1090 -> c
-    59:59:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1829:1829 -> c
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1400:1400 -> c
-    60:60:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1829 -> c
-    61:72:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1832:1843 -> c
-    73:75:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1889:1891 -> c
-    73:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1844 -> c
-    76:76:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1847:1847 -> c
-    77:78:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1896:1897 -> c
-    77:78:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1848 -> c
-    79:80:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1901:1902 -> c
-    79:80:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1851 -> c
-    81:82:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1854:1855 -> c
-    83:87:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1875:1879 -> c
-    83:87:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1856 -> c
-    88:93:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1857:1862 -> c
-    94:105: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):1911:1922 -> c
-    94:105:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1863 -> c
-    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):536:536 -> d
-    2:2:java.util.List getOptimizationsForPostIRProcessing():1062:1062 -> d
-    3:3:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1778:1778 -> d
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1437:1437 -> d
-    4:4:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1778 -> d
-    5:21:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1782:1798 -> d
-    22:25:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1928:1931 -> d
-    22:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1809 -> d
+    46:50:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1034:1038 -> c
+    51:52:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1103:1104 -> c
+    53:53:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1102:1102 -> c
+    54:54:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862:1862 -> c
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1434:1434 -> c
+    55:55:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862 -> c
+    56:67:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1865:1876 -> c
+    68:70:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1922:1924 -> c
+    68:70:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1877 -> c
+    71:71:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1880:1880 -> c
+    72:73:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1929:1930 -> c
+    72:73:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1881 -> c
+    74:75:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1934:1935 -> c
+    74:75:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1884 -> c
+    76:77:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1887:1888 -> c
+    78:82:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1908:1912 -> c
+    78:82:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1889 -> c
+    83:88:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1890:1895 -> c
+    89:100: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):1944:1955 -> c
+    89:100:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1896 -> c
+    1:1:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):533:533 -> d
+    2:2:java.util.List getOptimizationsForPostIRProcessing():1068:1068 -> d
+    3:3:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1811:1811 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1471:1471 -> d
+    4:4:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1811 -> d
+    5:21:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1815:1831 -> d
+    22:25:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1961:1964 -> d
+    22:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1842 -> d
     26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> d
-    26:26:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1931 -> d
-    26:26:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1809 -> d
-    27:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1932:1940 -> d
-    27:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1809 -> d
-    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):575:575 -> e
+    26:26:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1964 -> d
+    26:26:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1842 -> d
+    27:35:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1965:1973 -> d
+    27:35:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1842 -> d
+    1:1:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):572:572 -> e
     2:2:boolean isInWave():889:889 -> e
-    1:5:com.android.tools.r8.graph.DexApplication optimize():656:660 -> f
+    1:6:com.android.tools.r8.graph.DexApplication optimize():656:661 -> f
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.Q:
     java.util.Map protoFixupCache -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():101:101 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):108:108 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):106:110 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):101:101 -> a
-    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):101:101 -> a
-    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):114:118 -> a
-    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):126:136 -> a
-    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):661:681 -> a
-    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):138 -> a
-    40:424:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):141:525 -> a
-    425:428:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):461:464 -> a
-    429:429:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):463:463 -> a
-    430:433:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):451:454 -> a
-    434:434:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):453:453 -> a
-    435:459:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):193:217 -> a
-    460:493:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):616:649 -> a
-    460:493:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):217 -> a
-    494:494:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):640:640 -> a
-    494:494:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):217 -> a
-    495:495:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):639:639 -> a
-    495:495:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):217 -> a
-    496:516:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):220:240 -> a
-    517:537:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):235:255 -> a
-    538:555:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):250:267 -> a
-    556:557:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):399:400 -> a
-    556:557:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):267 -> a
-    558:566:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):268:276 -> a
-    567:586:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):275:294 -> a
-    587:587:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):293:293 -> a
-    588:588: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
-    588:588:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):297 -> a
-    589:609:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):298:318 -> a
-    610:828:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):147:365 -> a
-    829:834:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):364:369 -> a
-    835:839:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):368:372 -> a
-    840:914:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):371:445 -> a
-    915:915:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):444:444 -> a
-    916:924:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):333:341 -> a
-    925:933:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):340:348 -> a
-    934:937:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):347:350 -> a
-    938:941:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):179:182 -> a
-    942:1172:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):181:411 -> a
-    1173:1178:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):410:415 -> a
-    1179:1182:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):414:417 -> a
-    1183:1191:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):380:388 -> a
-    1192:1201:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):387:396 -> a
-    1202:1474:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):164:436 -> a
-    1475:1552:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):435:512 -> a
-    1553:1555:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):490:492 -> a
-    1556:1558:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):481:483 -> a
-    1559:1562:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):471:474 -> a
-    1563:1563:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):473:473 -> a
-    1564:1567:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):424:427 -> a
-    1568:1681:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):426:539 -> a
-    1682:1682:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):182:182 -> a
-    1683:1689:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):202:208 -> a
-    1690:1690: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
-    1690:1690:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):208 -> a
-    1691:1691:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    1691:1691:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):730 -> a
-    1692:1728:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):731:767 -> a
-    1729:1729:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1729:1729:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):767 -> a
-    1730:1741:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):768:779 -> a
-    1742:1742:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):427:427 -> a
-    1743:1743:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):445:445 -> a
-    1744:1744:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):455:455 -> a
-    1745:1745:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):465:465 -> a
-    1746:1746:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):484:484 -> a
-    1747:1748:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):550:551 -> a
-    1749:1759:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):564:574 -> a
-    1749:1759:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):552 -> a
-    1760:1763:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):553:556 -> a
-    1764:1767:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):579:582 -> a
-    1764:1767:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):556 -> a
-    1768:1770:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):555:557 -> a
-    1771:1774:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):586:589 -> a
-    1775:1784:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):588:597 -> a
-    1785:1799:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):688:702 -> a
-    1785:1799:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):597 -> a
-    1800:1800:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):693:693 -> a
-    1800:1800:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):597 -> a
-    1801:1803:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):723:725 -> a
-    1801:1803:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):693 -> a
-    1801:1803:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):597 -> a
-    1804:1823:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):696:715 -> a
-    1804:1823:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):597 -> a
-    1824:1827:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):598:601 -> a
-    1828:1833:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):786:791 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):436:436 -> b
-    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):475:475 -> c
+    1:1:void <clinit>():102:102 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):109:109 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.enums.EnumUnboxer):107:111 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.LensCodeRewriter):102:102 -> a
+    2:2:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):102:102 -> a
+    3:7:com.android.tools.r8.ir.code.Value makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:119 -> a
+    8:18:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):127:137 -> a
+    19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):672:692 -> a
+    19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):139 -> a
+    40:434:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):142:536 -> a
+    435:438:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):472:475 -> a
+    439:439:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):474:474 -> a
+    440:443:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):462:465 -> a
+    444:444:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):464:464 -> a
+    445:469:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):194:218 -> a
+    470:503:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):627:660 -> a
+    470:503:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):218 -> a
+    504:504:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):651:651 -> a
+    504:504:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):218 -> a
+    505:505:void checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):650:650 -> a
+    505:505:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):218 -> a
+    506:526:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):221:241 -> a
+    527:547:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):236:256 -> a
+    548:565:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):251:268 -> a
+    566:567:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.graph.RewrittenPrototypeDescription.getConstantReturn(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position):399:400 -> a
+    566:567:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):268 -> a
+    568:576:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):269:277 -> a
+    577:596:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):276:295 -> a
+    597:601:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):294:298 -> a
+    602:602:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    602:602:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):300 -> a
+    603:603:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):300:300 -> a
+    604:634:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):299:329 -> a
+    635:863:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):148:376 -> a
+    864:869:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):375:380 -> a
+    870:874:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):379:383 -> a
+    875:949:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):382:456 -> a
+    950:950:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):455:455 -> a
+    951:959:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):344:352 -> a
+    960:968:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):351:359 -> a
+    969:972:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):358:361 -> a
+    973:976:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):180:183 -> a
+    977:1217:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):182:422 -> a
+    1218:1223:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):421:426 -> a
+    1224:1227:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):425:428 -> a
+    1228:1236:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):391:399 -> a
+    1237:1246:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):398:407 -> a
+    1247:1529:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):165:447 -> a
+    1530:1607:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):446:523 -> a
+    1608:1610:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):501:503 -> a
+    1611:1613:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):492:494 -> a
+    1614:1617:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):482:485 -> a
+    1618:1618:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):484:484 -> a
+    1619:1622:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):435:438 -> a
+    1623:1736:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):437:550 -> a
+    1737:1737:com.android.tools.r8.ir.code.Instruction lambda$rewrite$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):183:183 -> a
+    1738:1744:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):203:209 -> a
+    1745:1745: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):67:67 -> a
+    1745:1745:com.android.tools.r8.ir.code.Instruction lambda$rewrite$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):209 -> a
+    1746:1746:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    1746:1746:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):741 -> a
+    1747:1783:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):742:778 -> a
+    1784:1784:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    1784:1784:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):778 -> a
+    1785:1796:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):779:790 -> a
+    1797:1797:com.android.tools.r8.ir.code.Instruction lambda$rewrite$2(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):438:438 -> a
+    1798:1798:com.android.tools.r8.ir.code.Instruction lambda$rewrite$4(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):456:456 -> a
+    1799:1799:com.android.tools.r8.ir.code.Instruction lambda$rewrite$5(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):466:466 -> a
+    1800:1800:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):476:476 -> a
+    1801:1801:com.android.tools.r8.ir.code.Instruction lambda$rewrite$8(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):495:495 -> a
+    1802:1803:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):561:562 -> a
+    1804:1814:boolean defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):575:585 -> a
+    1804:1814:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):563 -> a
+    1815:1818:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):564:567 -> a
+    1819:1822:com.android.tools.r8.ir.analysis.type.TypeElement defaultValueLatticeElement(com.android.tools.r8.graph.DexType):590:593 -> a
+    1819:1822:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):567 -> a
+    1823:1825:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):566:568 -> a
+    1826:1829:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):597:600 -> a
+    1830:1839:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):599:608 -> a
+    1840:1854:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):699:713 -> a
+    1840:1854:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):608 -> a
+    1855:1855:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):704:704 -> a
+    1855:1855:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):608 -> a
+    1856:1858:com.android.tools.r8.graph.DexValue$DexValueMethodHandle rewriteDexValueMethodHandle(com.android.tools.r8.graph.DexValue$DexValueMethodHandle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):734:736 -> a
+    1856:1858:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):704 -> a
+    1856:1858:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):608 -> a
+    1859:1878:java.util.List rewriteBootstrapArgs(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):707:726 -> a
+    1859:1878:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):608 -> a
+    1879:1882:com.android.tools.r8.graph.DexCallSite rewriteCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):609:612 -> a
+    1883:1888:com.android.tools.r8.graph.DexValue$DexValueMethodType rewriteDexMethodType(com.android.tools.r8.graph.DexValue$DexValueMethodType):797:802 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):447:447 -> b
+    1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):486:486 -> c
 com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.P:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
@@ -30782,10 +31066,10 @@
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():794:794 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):802:806 -> <init>
-    1:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):811:825 -> a
-    16:16:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):821:821 -> a
+    1:1:void <clinit>():805:805 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):813:817 -> <init>
+    1:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):822:836 -> a
+    16:16:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):832:832 -> a
 com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.ir.conversion.S:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -30809,33 +31093,74 @@
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> g
     void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> h
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.T:
+com.android.tools.r8.ir.conversion.MethodProcessingId -> com.android.tools.r8.ir.conversion.T:
+    int secondaryId -> b
+    int primaryId -> a
+    1:1:void <init>(int,com.android.tools.r8.ir.conversion.MethodProcessingId$1):13:13 -> <init>
+    2:2:void <init>(int):18:18 -> <init>
+    3:6:void <init>(int):16:19 -> <init>
+    1:4:java.lang.String getId():29:32 -> a
+    1:4:java.lang.String getAndIncrementId():23 -> a
+    5:5:java.lang.String getAndIncrementId():24:24 -> a
+    1:1:int getPrimaryId():36:36 -> b
+com.android.tools.r8.ir.conversion.MethodProcessingId$1 -> com.android.tools.r8.ir.conversion.T$a:
+com.android.tools.r8.ir.conversion.MethodProcessingId$Factory -> com.android.tools.r8.ir.conversion.T$b:
+    java.util.function.BiConsumer consumer -> a
+    int nextId -> b
+    1:1:void <init>():45:45 -> <init>
+    2:2:void <init>(java.util.function.BiConsumer):48:48 -> <init>
+    3:10:void <init>(java.util.function.BiConsumer):42:49 -> <init>
+    1:1:java.util.function.BiConsumer access$100(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):39:39 -> a
+    2:3:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds reserveIds(com.android.tools.r8.utils.collections.SortedProgramMethodSet):53:54 -> a
+com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds -> com.android.tools.r8.ir.conversion.U:
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory this$0 -> d
+    com.android.tools.r8.utils.collections.ProgramMethodSet seen -> c
+    boolean $assertionsDisabled -> e
+    int numberOfReservedIds -> b
+    int firstReservedId -> a
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):66:66 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):64:68 -> <init>
+    1:6:com.android.tools.r8.ir.conversion.MethodProcessingId get(com.android.tools.r8.graph.ProgramMethod,int):72:77 -> a
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.V:
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:boolean isPrimary():21:21 -> a
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():29:29 -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():29 -> b
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase() -> c
-com.android.tools.r8.ir.conversion.MethodProcessor$Phase -> com.android.tools.r8.ir.conversion.T$a:
+com.android.tools.r8.ir.conversion.MethodProcessor$Phase -> com.android.tools.r8.ir.conversion.V$a:
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase POST -> c
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase PRIMARY -> b
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase ONE_TIME -> a
     1:3:void <clinit>():11:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.U:
-    com.android.tools.r8.utils.collections.ProgramMethodSet wave -> a
-    1:2:void <init>(com.android.tools.r8.utils.collections.ProgramMethodSet):21:22 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance(com.android.tools.r8.utils.collections.ProgramMethodSet):34:34 -> a
-    2:2:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):49:49 -> a
-    3:3:void forEachWave(com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):55:55 -> a
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.ir.conversion.W:
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> b
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> a
+    1:3:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,com.android.tools.r8.utils.collections.SortedProgramMethodSet):25:27 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31:31 -> a
+    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
+    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
+    3:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):28:29 -> a
+    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37 -> a
+    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
+    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37:37 -> a
+    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
+    6:6:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
+    7:8:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):28:29 -> a
+    7:8:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37 -> a
+    9:9:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37:37 -> a
+    10:10:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):42:42 -> a
+    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):48:48 -> a
+    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):42 -> a
+    12:12:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):63:63 -> a
+    13:16:void forEachWave(com.android.tools.r8.utils.ThrowingBiConsumer):68:71 -> a
+    17:18:void forEachWave(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):79:80 -> a
+    19:19:void lambda$forEachWave$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):82:82 -> a
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance(com.android.tools.r8.graph.ProgramMethod):30:30 -> c
-    2:3:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):40:41 -> c
-    2:3:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance(com.android.tools.r8.graph.ProgramMethod):30 -> c
-    4:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance(com.android.tools.r8.graph.ProgramMethod):30:30 -> c
-    5:5:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():44:44 -> c
-    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor getInstance():26:26 -> d
-com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.V:
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():58:58 -> c
+com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.X:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> f
     1:1:void <clinit>():14:14 -> <clinit>
@@ -30844,78 +31169,78 @@
     2:2:void populateGraph(java.util.concurrent.ExecutorService):26:26 -> a
     3:4:boolean verifyAllMethodsWithCodeExists():35:36 -> a
     1:1:void processMethod(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.X:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.Z:
     java.util.Map methodsMap -> b
     java.util.Deque waves -> c
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.utils.collections.ProgramMethodSet wave -> d
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet processed -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):30:30 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):41:41 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):36:44 -> <init>
-    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):145:146 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):33:33 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):44:44 -> <init>
+    3:11:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):39:47 -> <init>
+    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):151:152 -> a
     3:3:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():278:278 -> a
-    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):149 -> a
-    4:7:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):150:153 -> a
-    8:8:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):162:162 -> a
-    9:20:void forEachWave(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):167:178 -> a
-    21:22:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod):173:174 -> a
-    23:34:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):188:199 -> a
-    23:34:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.ProgramMethod):175 -> a
-    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):54:55 -> b
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():49:49 -> c
-com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.W:
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.X$a:
+    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):155 -> a
+    4:7:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):156:159 -> a
+    8:8:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):168:168 -> a
+    9:23:void forEachWave(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):173:187 -> a
+    24:27:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):181:184 -> a
+    28:39:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId):198:209 -> a
+    28:39:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):183 -> a
+    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):57:58 -> b
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():52:52 -> c
+com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.Y:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.Z$a:
     java.util.Map optimizationsMap -> c
     java.util.Collection defaultCodeOptimizations -> a
-    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsMap -> b
-    1:1:void <init>(java.util.Collection):66:66 -> <init>
-    2:8:void <init>(java.util.Collection):61:67 -> <init>
-    1:9:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):72:80 -> a
-    10:14:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):79:83 -> a
-    15:15:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
-    16:16:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):88:88 -> a
-    17:21:void put(com.android.tools.r8.ir.conversion.PostOptimization):93:97 -> a
-    22:29:void mapDexEncodedMethods(com.android.tools.r8.graph.AppView):104:111 -> a
-    30:30:void lambda$mapDexEncodedMethods$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):109:109 -> a
-    31:31:void lambda$mapDexEncodedMethods$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
-    32:37:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):117:122 -> a
-    38:38:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):88:88 -> a
-    38:38:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
-    39:46:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):133:140 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    47:47:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):124 -> a
-    48:49:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):127:128 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.ir.conversion.Y:
+    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocess -> b
+    1:1:void <init>(java.util.Collection):69:69 -> <init>
+    2:7:void <init>(java.util.Collection):65:70 -> <init>
+    1:9:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):75:83 -> a
+    10:14:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):82:86 -> a
+    15:15:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):85:85 -> a
+    16:16:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):91:91 -> a
+    17:21:void put(com.android.tools.r8.ir.conversion.PostOptimization):96:100 -> a
+    22:31:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):107:116 -> a
+    32:32:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):113:113 -> a
+    33:33:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):112:112 -> a
+    34:39:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):122:127 -> a
+    40:40:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):91:91 -> a
+    40:40:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):136 -> a
+    41:49:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138:146 -> a
+    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    50:50:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):129 -> a
+    51:52:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):132:133 -> a
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.ir.conversion.a0:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit() -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.Z:
-    java.util.Deque waves -> c
-    com.android.tools.r8.utils.collections.ProgramMethodSet wave -> d
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.b0:
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> b
+    java.util.Deque waves -> d
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> e
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> b
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.conversion.CallGraph):44:47 -> <init>
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> c
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.conversion.CallGraph):48:52 -> <init>
     1:268:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):0:267 -> a
-    1:268:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56 -> a
-    269:270:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:57 -> a
-    271:292:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):78:99 -> a
-    293:294:void lambda$createWaves$0(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):87:88 -> a
-    295:295:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    296:297:com.android.tools.r8.utils.Timing lambda$forEachMethod$1(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.graph.ProgramMethod):131:132 -> a
-    298:299:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):138:139 -> a
-    298:299:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):122 -> a
-    300:306:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):122:128 -> a
-    307:318:void forEachMethod(com.android.tools.r8.utils.ThrowingFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):127:138 -> a
-    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):67:68 -> b
-    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():73:73 -> b
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():62:62 -> c
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.Z$a:
+    1:268:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
+    269:270:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61:62 -> a
+    271:292:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):83:104 -> a
+    293:294:void lambda$createWaves$0(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):92:93 -> a
+    295:295:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):110:110 -> a
+    296:297:com.android.tools.r8.utils.Timing lambda$forEachMethod$1(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):137:138 -> a
+    298:299:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):180:181 -> a
+    298:299:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):127 -> a
+    300:318:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):127:145 -> a
+    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):72:73 -> b
+    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():78:78 -> b
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():67:67 -> c
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.b0$a:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.ir.conversion.a0:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.ir.conversion.c0:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
     void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -30937,11 +31262,11 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.ir.conversion.j0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.ir.conversion.l0:
     1:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.b0:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.d0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.d0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.f0:
     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
@@ -30952,7 +31277,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):619:619 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.c0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.e0:
     1:1:void <init>():621:621 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):648:648 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):660:660 -> a
@@ -30972,19 +31297,19 @@
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):738:752 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):654:654 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):741 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.f0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.h0:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
     1:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Map,com.android.tools.r8.ir.code.Value):263:267 -> <init>
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):276:304 -> a
-    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):297:297 -> 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):296:296 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
     31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> a
+    31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> a
     31:31:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.e0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.g0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -31000,7 +31325,7 @@
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping.builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):0:615 -> a
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     636:660:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.h0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.j0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     boolean $assertionsDisabled -> d
@@ -31011,7 +31336,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):603:607 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.g0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.i0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.code.Phi idValue -> c
@@ -31054,14 +31379,14 @@
     879:942:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):498:561 -> a
     943:943:boolean addMappingsForStringsWithHash(com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.util.Set):551:551 -> a
     944:952:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):569:577 -> a
-    953:1000:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.ConstNumber.asConstNumberOrNull(com.android.tools.r8.ir.code.Instruction):0:47 -> a
-    953:1000:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):577 -> a
-    1001:1014:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):579:592 -> a
+    953:1002:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.ConstNumber.asConstNumberOrNull(com.android.tools.r8.ir.code.Instruction):0:49 -> a
+    953:1002:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):577 -> a
+    1003:1016:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):579:592 -> a
     1:27:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):376:402 -> b
     28:1551:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:1523 -> b
     28:1551:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):402 -> b
     1552:1552:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):403:403 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.i0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.k0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():769:769 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):772:773 -> a
@@ -31071,7 +31396,7 @@
     16:17:com.android.tools.r8.ir.code.Value getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793 -> a
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):799:804 -> a
     24:26:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):830:832 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.o0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.q0:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
@@ -31088,8 +31413,8 @@
     23:23:void run(com.android.tools.r8.ir.code.IRCode):87:87 -> b
     24:44:void run(com.android.tools.r8.ir.code.IRCode):83:103 -> b
     1:1:com.android.tools.r8.graph.AppView access$500(com.android.tools.r8.ir.conversion.StringSwitchRemover):48:48 -> c
-com.android.tools.r8.ir.conversion.StringSwitchRemover$1 -> com.android.tools.r8.ir.conversion.k0:
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.l0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$1 -> com.android.tools.r8.ir.conversion.m0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.n0:
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> g
     com.android.tools.r8.ir.code.BasicBlock block -> f
     boolean $assertionsDisabled -> j
@@ -31110,13 +31435,13 @@
     63:64:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
     63:64:void removeStringSwitch():258 -> a
     65:65:void removeStringSwitch():258:258 -> a
-    66:66:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    66:66:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> a
     66:66:void removeStringSwitch():258 -> a
     67:67:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    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):297 -> a
+    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):296 -> a
     67:67:void removeStringSwitch():258 -> a
     68:77:void removeStringSwitch():259:268 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.m0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.o0:
     com.android.tools.r8.ir.code.BasicBlock idSwitchBlock -> h
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.BasicBlock hashSwitchFallthroughBlock -> g
@@ -31162,7 +31487,7 @@
     1274:1282:void removeStringSwitch():391 -> a
     1283:1285:void removeStringSwitch():392:394 -> a
     1:1:int getAndIncrementNextBlockNumber():301:301 -> b
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.ir.conversion.n0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.ir.conversion.p0:
     java.util.ListIterator blockIterator -> b
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
@@ -31171,7 +31496,7 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):156:156 -> <init>
     2:7:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):169:174 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.q0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.s0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -31185,13 +31510,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.p0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.r0:
     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.r0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.ir.conversion.t0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -31205,55 +31530,54 @@
     28:28:void resolve(java.util.List,com.android.tools.r8.ir.code.IRCode):99:99 -> a
     29:45:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):139:155 -> a
     29:45:void resolve(java.util.List,com.android.tools.r8.ir.code.IRCode):102 -> a
-    46:48:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    46:48:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):148 -> a
-    46:48:void resolve(java.util.List,com.android.tools.r8.ir.code.IRCode):102 -> a
-    49:53:java.util.ArrayList constrainValues(boolean,java.util.List):160:164 -> a
-    54:67:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):172:185 -> a
-    68:110:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):28:70 -> a
-    68:110:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    111:111:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):65:65 -> a
+    46:46:void resolveRoundTwo(com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):148:148 -> a
+    46:46:void resolve(java.util.List,com.android.tools.r8.ir.code.IRCode):102 -> a
+    47:51:java.util.ArrayList constrainValues(boolean,java.util.List):160:164 -> a
+    52:65:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):172:185 -> a
+    66:108:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):28:70 -> a
+    66:108:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
+    109:109:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):65:65 -> a
+    109:109:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
+    110:110:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):60:60 -> a
+    110:110:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
+    111:111:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):55:55 -> a
     111:111:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    112:112:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):60:60 -> a
+    112:112:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):50:50 -> a
     112:112:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    113:113:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):55:55 -> a
+    113:113:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):45:45 -> a
     113:113:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    114:114:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):50:50 -> a
+    114:114:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):40:40 -> a
     114:114:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    115:115:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):45:45 -> a
+    115:115:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):35:35 -> a
     115:115:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    116:116:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):40:40 -> a
+    116:116:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):30:30 -> a
     116:116:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    117:117:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):35:35 -> a
-    117:117:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    118:118:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.constrainedType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.ValueTypeConstraint):30:30 -> a
-    118:118:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186 -> a
-    119:119:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186:186 -> a
-    120:120:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190:190 -> a
-    121:123:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):246:248 -> a
-    121:123:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-    124:124:com.android.tools.r8.ir.code.ValueTypeConstraint constraintForType(com.android.tools.r8.ir.analysis.type.TypeElement):64:64 -> a
-    124:124:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):249 -> a
+    117:117:void constrainArrayMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,java.util.function.Consumer):186:186 -> a
+    118:118:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190:190 -> a
+    119:121:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):246:248 -> a
+    119:121:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
+    122:122:com.android.tools.r8.ir.code.ValueTypeConstraint constraintForType(com.android.tools.r8.ir.analysis.type.TypeElement):64:64 -> a
+    122:122:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):249 -> a
+    122:122:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
+    123:123:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:250 -> a
+    123:123:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
+    124:124:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    124:124:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250 -> a
     124:124:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-    125:125:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:250 -> a
-    125:125:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-    126:126:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    126:126:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250 -> a
-    126:126:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-    127:142:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:265 -> a
-    127:142:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-    143:153:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):194:204 -> a
-    154:154:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value):212:212 -> a
-    154:154:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):204 -> a
-    155:155:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):205:205 -> a
-    156:159:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):198:201 -> a
-    160:160:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value):212:212 -> a
-    160:160:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):201 -> a
-    161:161:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):202:202 -> a
-    162:174:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):216:228 -> a
-    175:184:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):226:235 -> a
-    185:187:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
-com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.t.c.a:
+    125:140:void link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:265 -> a
+    125:140:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
+    141:151:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):194:204 -> a
+    152:152:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value):212:212 -> a
+    152:152:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):204 -> a
+    153:153:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):205:205 -> a
+    154:157:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):198:201 -> a
+    158:158:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value):212:212 -> a
+    158:158:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):201 -> a
+    159:159:com.android.tools.r8.ir.code.ValueTypeConstraint getCanonicalTypeConstraint(com.android.tools.r8.ir.code.Value,boolean):202:202 -> a
+    160:172:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):216:228 -> a
+    173:182:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):226:235 -> a
+    183:185:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):273:275 -> a
+com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.s.c.a:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():20:20 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):23:28 -> <init>
@@ -31289,7 +31613,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():60 -> m
     2:2:boolean delegatingToConstructor():60:60 -> m
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.t.c.b:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.s.c.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set holders -> e
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> c
@@ -31297,112 +31621,112 @@
     java.util.Map methodProviders -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
     boolean enabled -> d
-    1:1:void <clinit>():70:70 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):85:85 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):82:98 -> <init>
-    1:21:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):104:124 -> a
-    22:22:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):130:130 -> a
-    23:72:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):52:101 -> a
-    23:72:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):130 -> a
-    73:77:void desugar(com.android.tools.r8.ir.code.IRCode):134:138 -> a
-    78:78:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    78:78:void desugar(com.android.tools.r8.ir.code.IRCode):139 -> a
-    79:91:void desugar(com.android.tools.r8.ir.code.IRCode):140:152 -> a
-    92:94:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):293:295 -> a
-    92:94:void desugar(com.android.tools.r8.ir.code.IRCode):152 -> a
-    95:104:void desugar(com.android.tools.r8.ir.code.IRCode):157:166 -> a
-    105:105:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    105:105:void desugar(com.android.tools.r8.ir.code.IRCode):166 -> a
-    106:106:void desugar(com.android.tools.r8.ir.code.IRCode):166:166 -> a
-    107:116:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):185:194 -> a
-    117:117:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    117:117:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):194 -> a
-    118:120:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):171:173 -> a
-    118:120:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):196 -> a
-    121:142:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):197:218 -> a
-    143:143:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    143:143:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):218 -> a
-    144:150:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):221:227 -> a
-    151:151:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    151:151:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):227 -> a
-    152:164:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:243 -> a
-    165:165:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):232:232 -> a
-    166:192: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,com.android.tools.r8.graph.AppView):255:281 -> a
-    193:196:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):286:289 -> a
-    197:197:long lambda$getChecksumSupplier$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):289:289 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.t.c.b$a:
+    1:1:void <clinit>():68:68 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):83:83 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):80:96 -> <init>
+    1:17:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):101:117 -> a
+    18:18:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):124:124 -> a
+    19:68:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):52:101 -> a
+    19:68:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):124 -> a
+    69:73:void desugar(com.android.tools.r8.ir.code.IRCode):128:132 -> a
+    74:74:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
+    74:74:void desugar(com.android.tools.r8.ir.code.IRCode):133 -> a
+    75:87:void desugar(com.android.tools.r8.ir.code.IRCode):134:146 -> a
+    88:90:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):287:289 -> a
+    88:90:void desugar(com.android.tools.r8.ir.code.IRCode):146 -> a
+    91:100:void desugar(com.android.tools.r8.ir.code.IRCode):151:160 -> a
+    101:101:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    101:101:void desugar(com.android.tools.r8.ir.code.IRCode):160 -> a
+    102:102:void desugar(com.android.tools.r8.ir.code.IRCode):160:160 -> a
+    103:112:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):179:188 -> a
+    113:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    113:113:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):188 -> a
+    114:116:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):165:167 -> a
+    114:116:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):190 -> a
+    117:138:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191:212 -> a
+    139:139:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    139:139:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):212 -> a
+    140:146:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:221 -> a
+    147:147:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    147:147:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):221 -> a
+    148:160:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):225:237 -> a
+    161:161:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):226:226 -> a
+    162:188: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,com.android.tools.r8.graph.AppView):249:275 -> a
+    189:192:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):280:283 -> a
+    193:193:long lambda$getChecksumSupplier$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):283:283 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.s.c.b$a:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1452:1452 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1457:1458 -> <init>
+    1:1:void <clinit>():1446:1446 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1451:1452 -> <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,java.util.Set):1468:1469 -> a
-    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1479:1479 -> a
-    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1484:1484 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.t.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,java.util.Set):1462:1463 -> a
+    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1473:1473 -> a
+    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1478:1478 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.s.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):1495:1495 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1499:1501 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1489:1489 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1493:1495 -> <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,java.util.Set):1511:1512 -> 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,java.util.Set):1505:1506 -> a
     3:3:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> 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,java.util.Set):1511 -> a
-    4:22:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1517:1535 -> a
-    23:23:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1541 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.t.c.b$c:
+    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,java.util.Set):1505 -> a
+    4:22:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1511:1529 -> a
+    23:23:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1535:1535 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.s.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,java.util.Set) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.t.c.b$d:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.s.c.b$d:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1434:1435 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1428:1429 -> <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,java.util.Set) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.t.c.b$e:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.s.c.b$e:
     java.util.Map rewritable -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():298:298 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):303:303 -> <init>
-    2:52:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):301:351 -> <init>
-    1:1:boolean isEmpty():355:355 -> a
-    2:2:void visit(java.util.function.Consumer):359:359 -> a
-    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):364:494 -> a
-    134:134:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> a
-    135:136:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1421:1422 -> a
-    137:137:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1426:1426 -> a
-    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):500:838 -> b
-    340:340:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1086:1086 -> b
+    1:1:void <clinit>():292:292 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):297:297 -> <init>
+    2:52:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):295:345 -> <init>
+    1:1:boolean isEmpty():349:349 -> a
+    2:2:void visit(java.util.function.Consumer):353:353 -> a
+    3:133:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):358:488 -> a
+    134:134:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1059 -> a
+    135:136:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1415:1416 -> a
+    137:137:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1420:1420 -> a
+    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):494:832 -> b
+    340:340:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1080:1080 -> 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$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1106 -> c
+    1:6:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100 -> 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$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1106 -> c
+    7:40:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100 -> 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$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1106 -> c
+    41:41:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100 -> 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$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1106 -> c
-    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):845:1003 -> c
-    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1015:1062 -> d
-    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1059:1083 -> d
-    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1080:1103 -> d
-    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1100:1118 -> d
-    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1187:1215 -> e
-    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1356:1378 -> f
-    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1222:1282 -> g
-    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1384:1403 -> h
-    1:60:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1123:1182 -> i
-    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1289:1349 -> j
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1410:1416 -> k
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.t.c.b$f:
+    42:60:com.android.tools.r8.graph.Code lambda$initializeAndroidRMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100 -> c
+    61:219:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):839:997 -> c
+    1:48:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1009:1056 -> d
+    49:73:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1053:1077 -> d
+    74:97:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1074:1097 -> d
+    98:116:void initializeAndroidRMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1112 -> d
+    1:29:void initializeJava10MethodProviders(com.android.tools.r8.graph.DexItemFactory):1181:1209 -> e
+    1:23:void initializeJava10OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1350:1372 -> f
+    1:61:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1216:1276 -> g
+    1:20:void initializeJava11OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1378:1397 -> h
+    1:60:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1117:1176 -> i
+    1:61:void initializeJava9OptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1283:1343 -> j
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1404:1410 -> k
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.s.c.b$f:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
-    1:1:void <clinit>():1553:1553 -> <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):1559:1560 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1565:1572 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.t.c.b$g:
+    1:1:void <clinit>():1547:1547 -> <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):1553:1554 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1559:1566 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.s.c.b$g:
     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.t.c.g:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.s.c.g:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer newSynthesizedMethodConsumer -> d
@@ -31414,140 +31738,130 @@
     java.util.Map newSyntheticMethods -> j
     java.util.Map classInfo -> g
     java.util.Map libraryClassInfo -> h
-    1:1:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):197:197 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):178:208 -> <init>
-    1:1:void addSyntheticMethods():224:224 -> a
-    2:3:void lambda$addSyntheticMethods$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):226:227 -> a
-    4:8: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):262:266 -> a
-    9:22:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):286:299 -> a
-    9: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):264 -> a
-    23:29:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):298:304 -> a
-    23:29: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):264 -> a
-    30:30:boolean needsLibraryInfo():212:212 -> a
-    30:30:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):350 -> a
-    30:30:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):306 -> a
-    30:30: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):264 -> a
-    31:31:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):350:350 -> a
-    31:31:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):306 -> a
-    31: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):264 -> a
-    32:39:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):311:318 -> a
-    32: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):264 -> a
-    40:40:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):339:339 -> a
-    40:40:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):322 -> a
-    40:40: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):264 -> a
-    41:41:boolean needsLibraryInfo():212:212 -> a
-    41:41:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):339 -> a
-    41:41:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):322 -> a
-    41:41: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):264 -> a
-    42:44:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):339:341 -> a
-    42:44:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):322 -> a
-    42:44: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):264 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    45:45:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):342 -> a
-    45:45:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):322 -> a
-    45:45: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):264 -> a
-    46:46:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):345:345 -> a
-    46:46:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):322 -> a
-    46:46: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):264 -> a
-    47:57:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):323:333 -> a
-    47:57: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):264 -> a
-    58:58: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):274:274 -> a
-    59:167:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo 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):0:108 -> a
-    59:167: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):274 -> a
-    168:169:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):268:269 -> a
-    170:195:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):383:408 -> a
-    170:195:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    196:196:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):390:390 -> a
-    196:196:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    197:197:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    197:197:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):393 -> a
-    197:197:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    198:198:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):393:393 -> a
-    198:198:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    199:201:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):356:358 -> a
-    202:202:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$2(com.android.tools.r8.graph.DexProgramClass):357:357 -> a
-    203:212:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):362:371 -> a
-    213:213:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    213:213:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):371 -> a
-    214:214:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):377:377 -> a
-    215:215:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):374:374 -> a
-    216:221:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):415:420 -> a
-    222:226:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):432:436 -> a
-    227:228:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):442:443 -> a
-    227:228:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    229:230:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427:428 -> a
-    229:230:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):443 -> a
-    229:230:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    231:232:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):444:445 -> a
-    231:232:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    233:345:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():0:112 -> a
-    233:345:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):445 -> a
-    233:345:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    346:346:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():81:81 -> a
-    346:346:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):445 -> a
-    346:346:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    347:351:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):445:449 -> a
-    347:351:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):436 -> a
-    352:356:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexType):454:458 -> a
-    357:360:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):462:465 -> a
-    361:364:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):469:472 -> a
-    1:1:boolean ignoreLibraryInfo():216:216 -> b
-    2:2:void processClass(com.android.tools.r8.graph.DexProgramClass):220:220 -> 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):478:479 -> 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):483:486 -> 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):490:493 -> b
-    9:12:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> 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):233:236 -> 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):495 -> b
-    13:16:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> b
-    17:17:boolean needsLibraryInfo():212:212 -> 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):236 -> 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):495 -> b
-    17:17:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> 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):236:245 -> 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):495 -> b
-    18:27:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> b
-    28:87:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.create(java.util.Set):0:59 -> b
-    28:87: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
-    28:87:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):495 -> b
-    28:87:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> b
-    88:88:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):245:245 -> b
-    88:88:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):495 -> b
-    88:88:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):486 -> b
-com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.t.c.c:
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):195:195 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter,java.util.function.Consumer):176:206 -> <init>
+    1:1:void addSyntheticMethods():222:222 -> a
+    2:3:void lambda$addSyntheticMethods$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):224:225 -> a
+    4:7:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):231:234 -> a
+    8:8:boolean needsLibraryInfo():210:210 -> a
+    8:8:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):234 -> a
+    9:15:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):234:240 -> a
+    16:73:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.create(java.util.Set):0:57 -> a
+    16:73:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):241 -> a
+    74:74:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):241:241 -> a
+    75:79: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):258:262 -> a
+    80:93:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):282:295 -> a
+    80:93: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):260 -> a
+    94:100:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):294:300 -> a
+    94:100: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):260 -> a
+    101:101:boolean needsLibraryInfo():210:210 -> a
+    101:101:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):345 -> a
+    101:101:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):302 -> a
+    101:101: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):260 -> a
+    102:102:boolean dontRewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):345:345 -> a
+    102:102:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):302 -> a
+    102:102: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):260 -> a
+    103:110:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):307:314 -> a
+    103:110: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):260 -> a
+    111:111:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334:334 -> a
+    111:111:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):318 -> a
+    111:111: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):260 -> a
+    112:112:boolean needsLibraryInfo():210:210 -> a
+    112:112:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334 -> a
+    112:112:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):318 -> a
+    112:112: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):260 -> a
+    113:115:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):334:336 -> a
+    113:115:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):318 -> a
+    113:115: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):260 -> a
+    116:116:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    116:116:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):337 -> a
+    116:116:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):318 -> a
+    116:116: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):260 -> a
+    117:117:boolean isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):340:340 -> a
+    117:117:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):318 -> a
+    117:117: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):260 -> a
+    118:127:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):319:328 -> a
+    118:127: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):260 -> a
+    128:128: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):270:270 -> a
+    129:235:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo 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):0:106 -> a
+    129:235: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):270 -> a
+    236:237:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):264:265 -> a
+    238:263:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):378:403 -> a
+    238:263:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):266 -> a
+    264:264:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):385:385 -> a
+    264:264:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):266 -> a
+    265:265:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    265:265:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):388 -> a
+    265:265:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):266 -> a
+    266:267:void addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):388:389 -> a
+    266:267:void lambda$computeClassInfo$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):266 -> a
+    268:270:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):351:353 -> a
+    271:271:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$2(com.android.tools.r8.graph.DexProgramClass):352:352 -> a
+    272:281:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):357:366 -> a
+    282:282:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    282:282:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):366 -> a
+    283:283:void addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):372:372 -> a
+    284:284:com.android.tools.r8.ir.conversion.SourceCode lambda$addICCEThrowingMethod$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):369:369 -> a
+    285:290:com.android.tools.r8.graph.DexClass definitionOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):410:415 -> a
+    291:295:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):427:431 -> a
+    296:297:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):437:438 -> a
+    296:297:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    298:299:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):422:423 -> a
+    298:299:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):438 -> a
+    298:299:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    300:301:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):439:440 -> a
+    300:301:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    302:412:boolean com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo.isEmpty():0:110 -> a
+    302:412:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):440 -> a
+    302:412:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    413:413:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():79:79 -> a
+    413:413:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):440 -> a
+    413:413:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    414:418:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo visitClassInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):440:444 -> a
+    414:418:com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo lambda$visitClassInfo$4(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):431 -> a
+    419:423:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexType):449:453 -> a
+    424:427:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):457:460 -> a
+    428:431:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):464:467 -> a
+    1:1:boolean ignoreLibraryInfo():214:214 -> b
+    2:2:void processClass(com.android.tools.r8.graph.DexProgramClass):218:218 -> 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):473:474 -> 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):478:481 -> b
+    9:14:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):485:490 -> b
+    9:14:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):481 -> b
+com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.s.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
-    1:1:void <clinit>():90:90 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):99:101 -> <init>
-    1:2:boolean isTargetedByForwards(com.android.tools.r8.graph.DexEncodedMethod):116:117 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.t.c.d:
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList):97:99 -> <init>
+    1:2:boolean isTargetedByForwards(com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
+com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.s.c.d:
     com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
-    1:1:void <clinit>():152:152 -> <clinit>
-    1:1:void <init>():155:155 -> <init>
+    1:1:void <clinit>():150:150 -> <clinit>
+    1:1:void <init>():153:153 -> <init>
     com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
     void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter) -> a
-    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):165 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.t.c.e:
+    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):163 -> a
+com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.s.c.e:
     java.util.Set signatures -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures EMPTY -> b
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:2:void <init>(java.util.Set):64:65 -> <init>
-    1:1:boolean isEmpty():81:81 -> a
-    1:1:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):69 -> a
-    2:2:boolean isEmpty():81:81 -> a
-    2:2:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):72 -> a
-    3:5:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):75:77 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.t.c.f:
+    1:1:void <clinit>():54:54 -> <clinit>
+    1:2:void <init>(java.util.Set):62:63 -> <init>
+    1:1:boolean isEmpty():79:79 -> a
+    1:1:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):67 -> a
+    2:2:boolean isEmpty():79:79 -> a
+    2:2:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):70 -> a
+    3:5:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):73:75 -> a
+com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.s.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):127:129 -> <init>
-    1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):133:137 -> a
-    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):141:141 -> a
-    7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):145:145 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.t.c.h:
+    1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):125:127 -> <init>
+    1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):131:135 -> a
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):139:139 -> a
+    7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):143:143 -> a
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.s.c.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int $r8$clinit -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -31584,45 +31898,45 @@
     52:58:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):153:159 -> a
     59:83:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
     59:83:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):161 -> a
-    84:95:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):162:173 -> a
-    96:96:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    96:96:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):173 -> a
-    97:98:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):177:178 -> a
-    99:99:boolean lambda$buildCovariantReturnTypeMethod$1(com.android.tools.r8.graph.DexAnnotation):172:172 -> a
-    100:114:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):206:220 -> a
-    115:119:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:218 -> a
-    120:120:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215:215 -> a
-    121:121:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    121:121:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215 -> a
-    122:146:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215:239 -> a
-    147:151:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):228:232 -> 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):229:229 -> a
-    153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    153:153:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):229 -> a
-    154:176:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):229:251 -> a
-    177:177:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248:248 -> a
-    178:178:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    178:178:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248 -> a
-    179:179:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248:248 -> a
-    180:180:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256:256 -> a
-    181:181:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):260:260 -> a
-    181:181:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256 -> a
+    84:96:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):162:174 -> a
+    97:97:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):174 -> a
+    98:99:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):177:178 -> a
+    100:100:boolean lambda$buildCovariantReturnTypeMethod$1(com.android.tools.r8.graph.DexAnnotation):172:172 -> a
+    101:115:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):206:220 -> a
+    116:120:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:218 -> a
+    121:121:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215:215 -> a
+    122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    122:122:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215 -> a
+    123:147:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):215:239 -> a
+    148:152:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):228:232 -> a
+    153:153:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):229:229 -> a
+    154:154:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    154:154:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):229 -> a
+    155:177:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):229:251 -> a
+    178:178:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248:248 -> a
+    179:179:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    179:179:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248 -> a
+    180:180:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):248:248 -> a
+    181:181:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256:256 -> a
+    182:182:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):260:260 -> a
+    182:182:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):256 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):101:101 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.i:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.s.c.i:
     boolean $assertionsDisabled -> i
     java.util.Map metNestHosts -> h
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):50:50 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):47:47 -> <init>
     1:16:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):54:69 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
     17:17:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):69 -> a
     18:28:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):70:80 -> a
-    29:29: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
+    29:29: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):35:35 -> a
     29:29:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):80 -> a
     30:34:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):79:83 -> a
     35:41:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):82:88 -> a
-    42:42:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
+    42:42:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
     42:42:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):88 -> a
     43:52:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):89:98 -> a
     53:53:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):97:97 -> a
@@ -31639,19 +31953,19 @@
     74:74:boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List):147:147 -> a
     75:75:void reportIncompleteNest(java.util.List):157:157 -> a
     1:1:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):152:152 -> c
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.t.c.k:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.s.c.k:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):60:61 -> a
     3:5:void hideMatches(com.android.tools.r8.graph.DexMethod):65:67 -> a
-    6:159:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:153 -> a
-    6:159:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
-    160:161:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
-    162:162:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    163:165:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.t.c.j:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.t.c.k$a:
+    6:160:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:154 -> a
+    6:160:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
+    161:162:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
+    163:163:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
+    164:166: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:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> c
@@ -31661,7 +31975,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.t.c.l:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.s.c.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set trackedCallBackAPIs -> g
     java.util.Set trackedAPIs -> h
@@ -31730,7 +32044,7 @@
     88:88:void desugar(com.android.tools.r8.ir.code.IRCode):133 -> a
     89:111: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):449:471 -> a
     89:111:void desugar(com.android.tools.r8.ir.code.IRCode):133 -> a
-    112:112: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
+    112:112: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):67:67 -> a
     112:112: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):467 -> a
     112:112:void desugar(com.android.tools.r8.ir.code.IRCode):133 -> a
     113:115: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):473:473 -> a
@@ -31742,12 +32056,12 @@
     142:142:java.util.List lambda$addCallBackSignature$1(com.android.tools.r8.graph.DexProgramClass):250:250 -> a
     143:157: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):262:276 -> a
     158:163:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):284:289 -> a
-    164:171:void lambda$generateCallbackMethods$3(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,java.util.List):302:309 -> a
+    164:171:void lambda$generateCallbackMethods$3(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,java.util.List):302:309 -> a
     172:172:java.util.List synthesizeWrappers(java.util.Map):317:317 -> a
     173:173:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):322:322 -> a
     174:186:com.android.tools.r8.graph.ProgramMethod generateCallbackMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):327:339 -> a
-    174:186:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):305 -> a
-    187:188:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):306:307 -> a
+    174:186:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):305 -> a
+    187:188:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):306:307 -> a
     189:195:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):343:349 -> a
     196:200:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):353:357 -> a
     201:203:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):373:375 -> a
@@ -31759,30 +32073,35 @@
     254: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):570:570 -> a
     255:256:boolean canConvert(com.android.tools.r8.graph.DexType):579:580 -> a
     1:5:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):149:153 -> b
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     6:6:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):153 -> b
     7:10:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):154:157 -> b
     11:21:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):193:203 -> b
-    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     22:22:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):203 -> b
     23:27:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):207:211 -> b
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> b
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> b
     28:28:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):211 -> b
     29:32:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):214:217 -> b
-    33:51:com.android.tools.r8.utils.collections.ProgramMethodSet generateCallbackMethods():293:311 -> b
+    33:51:com.android.tools.r8.utils.collections.SortedProgramMethodSet generateCallbackMethods():293:311 -> b
     1:1:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):161:161 -> c
     2:6:void registerCallback(com.android.tools.r8.graph.ProgramMethod):232:236 -> c
     2:6:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> c
     7:7:void registerCallback(com.android.tools.r8.graph.ProgramMethod):236 -> c
     7:7:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162 -> c
     8:11:void registerCallback(com.android.tools.r8.graph.ProgramMethod):240:243 -> c
     8:11:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162 -> c
     1:7:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):174:180 -> d
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():265:265 -> d
+    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():262:262 -> d
     8:8:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):180 -> d
     9:17:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):180:188 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.t.c.m:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.s.c.l$a:
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode GENERATE_CALLBACKS_AND_WRAPPERS -> a
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode ASSERT_CALLBACKS_AND_WRAPPERS_GENERATED -> b
+    1:2:void <clinit>():81:82 -> <clinit>
+    1:1:void <init>(java.lang.String,int):80:80 -> <init>
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.s.c.m:
     java.util.Map customConversions -> i
     java.util.List dontRewriteInvocation -> j
     java.lang.String synthesizedLibraryClassesPackagePrefix -> c
@@ -31815,7 +32134,7 @@
     1:1:java.util.Map getRewritePrefix():127:127 -> j
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():119:119 -> k
     1:1:boolean isLibraryCompilation():115:115 -> l
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.t.c.m$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.s.c.m$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -31869,7 +32188,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):270 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):270:270 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.t.c.n:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.s.c.n:
     int minAPILevel -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -31890,752 +32209,756 @@
     104:111:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):108 -> a
     112:120:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):110:118 -> a
     121:121:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):58:58 -> a
-    122:124:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    122:124:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):58 -> a
-    125:125:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50:50 -> a
-    126:128:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    126:128:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.t.c.r:
+    122:122:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):50:50 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.s.c.r:
     java.util.Map retargetLibraryMember -> b
     java.util.Map virtualRewrites -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set emulatedDispatchMethods -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():47:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
-    2:17:void <init>(com.android.tools.r8.graph.AppView):53:68 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):47:47 -> a
-    2:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):73:75 -> a
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    5:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):76 -> a
-    6:11:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):85:90 -> a
-    6:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):78 -> a
-    12:12:void visit(java.util.function.Consumer):95:95 -> a
-    13:13:void desugar(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView):52:65 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):46:46 -> a
+    2:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):70:72 -> a
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    5:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):73 -> a
+    6:11:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82:87 -> a
+    6:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):75 -> a
+    12:12:void visit(java.util.function.Consumer):92:92 -> a
+    13:13:void desugar(com.android.tools.r8.ir.code.IRCode):96:96 -> a
     14:14:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    14:14:void desugar(com.android.tools.r8.ir.code.IRCode):103 -> a
-    15:50:void desugar(com.android.tools.r8.ir.code.IRCode):104:139 -> a
-    51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    51:51:void desugar(com.android.tools.r8.ir.code.IRCode):141 -> a
-    52:59:void desugar(com.android.tools.r8.ir.code.IRCode):142:149 -> a
-    60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    60:60:void desugar(com.android.tools.r8.ir.code.IRCode):148 -> a
-    61:62:void desugar(com.android.tools.r8.ir.code.IRCode):155:156 -> a
-    63:63:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    63:63:void desugar(com.android.tools.r8.ir.code.IRCode):155 -> a
-    64:70:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):161:167 -> a
-    71:71:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):252:252 -> a
-    72:72:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):443:443 -> a
-    72:72:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    73:73:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):443 -> a
-    73:73:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    74:81:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):447:454 -> a
-    74:81:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    82:82:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    82:82:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):456 -> a
-    82:82:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    83:83:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):456:456 -> a
-    83:83:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    84:84:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):455:455 -> a
-    84:84:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    85:85:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):451:451 -> a
-    85:85:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):47 -> a
-    86:86:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.DexMethod):469:469 -> a
-    86:86:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexMethod):47 -> a
-    87:101:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexMethod,java.lang.String):473:487 -> a
-    1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):47:47 -> b
-    2:7:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):171:176 -> b
-    8:8:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.DexMethod):465:465 -> b
-    8:8:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexMethod):47 -> b
-    1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):47:47 -> c
-    1:1:java.util.Set access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):47:47 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.t.c.o:
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.t.c.p:
+    14:14:void desugar(com.android.tools.r8.ir.code.IRCode):100 -> a
+    15:49:void desugar(com.android.tools.r8.ir.code.IRCode):101:135 -> a
+    50:50:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    50:50:void desugar(com.android.tools.r8.ir.code.IRCode):137 -> a
+    51:58:void desugar(com.android.tools.r8.ir.code.IRCode):138:145 -> a
+    59:59:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    59:59:void desugar(com.android.tools.r8.ir.code.IRCode):144 -> a
+    60:61:void desugar(com.android.tools.r8.ir.code.IRCode):151:152 -> a
+    62:62:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    62:62:void desugar(com.android.tools.r8.ir.code.IRCode):151 -> a
+    63:69:com.android.tools.r8.graph.DexMethod getRetargetLibraryMember(com.android.tools.r8.graph.DexMethod):157:163 -> a
+    70:70:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):248:248 -> a
+    71:71:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):439:439 -> a
+    71:71:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    72:72:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):439 -> a
+    72:72:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    73:80:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):443:450 -> a
+    73:80:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    81:81:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    81:81:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):452 -> a
+    81:81:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    82:82:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):452:452 -> a
+    82:82:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    83:83:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):451:451 -> a
+    83:83:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    84:84:void reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):447:447 -> a
+    84:84:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):46 -> a
+    85:85:com.android.tools.r8.graph.DexType dispatchHolderTypeFor(com.android.tools.r8.graph.DexMethod):464:464 -> a
+    85:85:com.android.tools.r8.graph.DexType access$400(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexMethod):46 -> a
+    86:100:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexMethod,java.lang.String):468:482 -> a
+    1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):46:46 -> b
+    2:7:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):167:172 -> b
+    8:8:com.android.tools.r8.graph.DexType dispatchInterfaceTypeFor(com.android.tools.r8.graph.DexMethod):460:460 -> b
+    8:8:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexMethod):46 -> b
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):46:46 -> c
+    1:1:java.util.Set access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):46:46 -> d
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.s.c.o:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.s.c.p:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():258:258 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):258:258 -> <init>
-    1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):263:263 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):263 -> a
-    3:3:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):356:356 -> a
-    3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    4:4:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):356 -> a
-    4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    5:19:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):356:370 -> a
-    5:19:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    20:28:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):399:407 -> a
-    20:28:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):372 -> a
-    20:28:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    29:29:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):407 -> a
-    29:29:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):372 -> a
-    29:29:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    30:38:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):373:373 -> a
-    30:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    47:48:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):382:383 -> a
-    47:48:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    49:65: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):421:437 -> a
-    49:65:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):384 -> a
-    49:65:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    66:66: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):431:431 -> a
-    66:66:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):384 -> a
-    66:66:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    67:75:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):385:385 -> a
-    67:75:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):264 -> a
-    76:76:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):266:266 -> a
-    77:77:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):272:272 -> a
-    78:78:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    78:78:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):272 -> a
-    79:79:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):272:272 -> a
+    1:1:void <clinit>():254:254 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):254:254 -> <init>
+    1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):259:259 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):259 -> a
+    3:3:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):352:352 -> a
+    3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    4:4:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):352 -> a
+    4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    5:19:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):352:366 -> a
+    5:19:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    20:28:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):395:403 -> a
+    20:28:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):368 -> a
+    20:28:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    29:29:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod generateInterfaceDispatchMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):403 -> a
+    29:29:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):368 -> a
+    29:29:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    30:38:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):369:369 -> a
+    30:38:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    47:48:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):378:379 -> a
+    47:48:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    49:65: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:433 -> a
+    49:65:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):380 -> a
+    49:65:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    66:66: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):427:427 -> a
+    66:66:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):380 -> a
+    66:66:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    67:75:void synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):381:381 -> a
+    67:75:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):260 -> a
+    76:76:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):262:262 -> a
+    77:77:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):268:268 -> a
+    78:78:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    78:78:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):268 -> a
+    79:79:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):268:268 -> a
     80:80:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    80:80:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):273 -> a
-    81:91:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):274:284 -> a
-    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    92:92:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):284 -> a
-    93:104:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):288:299 -> a
-    105:105:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):292:292 -> a
-    106:110:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):304:308 -> a
-    106:110:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):292 -> a
-    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    111:111:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):308 -> a
-    111:111:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):292 -> a
-    112:119:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):309:316 -> a
-    112:119:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):292 -> a
-    120:120:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):310:310 -> a
-    120:120:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):292 -> a
-    121:121:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293:293 -> a
-    122:127:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):329:334 -> a
-    122:127:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    128:132:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):348:352 -> a
-    128:132:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):336 -> a
-    128:132:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    133:133:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    133:133:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):352 -> a
-    133:133:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):336 -> a
-    133:133:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    134:134:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):352:352 -> a
-    134:134:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):336 -> a
-    134:134:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    135:135:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):351:351 -> a
-    135:135:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):336 -> a
-    135:135:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    136:137:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):337:338 -> a
-    136:137:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):293 -> a
-    138:138:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):294:294 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.t.c.q:
+    80:80:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):269 -> a
+    81:91:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):270:280 -> a
+    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    92:92:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):280 -> a
+    93:104:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):284:295 -> a
+    105:105:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):288:288 -> a
+    106:110:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):300:304 -> a
+    106:110:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):288 -> a
+    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    111:111:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):304 -> a
+    111:111:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):288 -> a
+    112:119:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):305:312 -> a
+    112:119:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):288 -> a
+    120:120:boolean inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):306:306 -> a
+    120:120:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):288 -> a
+    121:121:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289:289 -> a
+    122:127:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):325:330 -> a
+    122:127:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    128:132:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):344:348 -> a
+    128:132:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):332 -> a
+    128:132:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    133:133:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    133:133:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):348 -> a
+    133:133:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):332 -> a
+    133:133:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    134:134:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):348:348 -> a
+    134:134:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):332 -> a
+    134:134:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    135:135:com.android.tools.r8.graph.DexEncodedMethod createForwardingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):347:347 -> a
+    135:135:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):332 -> a
+    135:135:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    136:137:void addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):333:334 -> a
+    136:137:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):289 -> a
+    138:138:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):290:290 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.s.c.q:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():183:183 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):183:183 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):183:183 -> <init>
-    1:5:void setUpRetargeting():186:190 -> a
-    1:5:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    6:6:void setUpRetargeting():190 -> a
-    6:6:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    7:7:void setUpRetargeting():192:192 -> a
-    7:7:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    8:14:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):227:233 -> a
-    8:14:void setUpRetargeting():193 -> a
-    8:14:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    15:19:void setUpRetargeting():194:198 -> a
-    15:19:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    20:1103:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1083 -> a
-    20:1103:void setUpRetargeting():198 -> a
-    20:1103:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1104:1104:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1104:1104:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1084 -> a
-    1104:1104:void setUpRetargeting():198 -> a
-    1104:1104:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1105:1114:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1085:1094 -> a
-    1105:1114:void setUpRetargeting():198 -> a
-    1105:1114:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1115:1115:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    1115:1115:void setUpRetargeting():201 -> a
-    1115:1115:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1116:1116:void setUpRetargeting():204:204 -> a
-    1116:1116:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1117:1118:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):238:239 -> a
-    1117:1118:void setUpRetargeting():204 -> a
-    1117:1118:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1119:1119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    1119:1119:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):239 -> a
-    1119:1119:void setUpRetargeting():204 -> a
-    1119:1119:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1120:1123:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):241:244 -> a
-    1120:1123:void setUpRetargeting():204 -> a
-    1120:1123:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1124:1130:void setUpRetargeting():205:211 -> a
-    1124:1130:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1131:1134:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):219:222 -> a
-    1131:1134:void setUpRetargeting():211 -> a
-    1131:1134:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-    1135:1135:void setUpRetargeting():210:210 -> a
-    1135:1135:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):183 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.t.c.s:
-    com.android.tools.r8.graph.DexString dexWrapperPrefix -> b
-    java.util.Map typeWrappers -> c
+    1:1:void <clinit>():179:179 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):179:179 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):179:179 -> <init>
+    1:5:void setUpRetargeting():182:186 -> a
+    1:5:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    6:6:void setUpRetargeting():186 -> a
+    6:6:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    7:7:void setUpRetargeting():188:188 -> a
+    7:7:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    8:14:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):223:229 -> a
+    8:14:void setUpRetargeting():189 -> a
+    8:14:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    15:19:void setUpRetargeting():190:194 -> a
+    15:19:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    20:1105:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1085 -> a
+    20:1105:void setUpRetargeting():194 -> a
+    20:1105:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1106:1106:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    1106:1106:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1086 -> a
+    1106:1106:void setUpRetargeting():194 -> a
+    1106:1106:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1107:1116:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1087:1096 -> a
+    1107:1116:void setUpRetargeting():194 -> a
+    1107:1116:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1117:1117:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    1117:1117:void setUpRetargeting():197 -> a
+    1117:1117:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1118:1118:void setUpRetargeting():200:200 -> a
+    1118:1118:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1119:1120:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):234:235 -> a
+    1119:1120:void setUpRetargeting():200 -> a
+    1119:1120:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1121:1121:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    1121:1121:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):235 -> a
+    1121:1121:void setUpRetargeting():200 -> a
+    1121:1121:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1122:1125:void handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):237:240 -> a
+    1122:1125:void setUpRetargeting():200 -> a
+    1122:1125:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1126:1132:void setUpRetargeting():201:207 -> a
+    1126:1132:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1133:1136:com.android.tools.r8.graph.DexMethod computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):215:218 -> a
+    1133:1136:void setUpRetargeting():207 -> a
+    1133:1136:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+    1137:1137:void setUpRetargeting():206:206 -> a
+    1137:1137:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):179 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.s.c.s:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map vivifiedTypeWrappers -> d
-    boolean $assertionsDisabled -> i
-    com.android.tools.r8.graph.DexItemFactory factory -> f
-    java.util.Set invalidWrappers -> e
-    com.android.tools.r8.graph.DexString vivifiedSourceFile -> h
-    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> g
+    com.android.tools.r8.graph.DexString dexWrapperPrefixDexString -> c
+    java.util.Map typeWrappers -> d
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.DexItemFactory factory -> g
+    java.util.Set invalidWrappers -> f
+    com.android.tools.r8.graph.DexString vivifiedSourceFile -> i
+    java.util.Map vivifiedTypeWrappers -> e
+    java.lang.String dexWrapperPrefixString -> b
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> h
     1:1:void <clinit>():95:95 -> <clinit>
-    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):103:119 -> <init>
-    1:1:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):127:127 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):127 -> a
-    3:6:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):128:131 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    7:7:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):131 -> a
-    8:13:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):147:147 -> a
-    8:13:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):161 -> a
-    14:16:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):162:162 -> a
-    17:18:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map):157:158 -> a
-    19:36:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):212:229 -> a
-    37:40:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):474:477 -> a
-    37:40:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):232 -> a
-    41:49:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):475:483 -> a
-    41:49:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):232 -> a
-    50:55:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):488:493 -> a
-    50:55:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):479 -> a
-    50:55:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):232 -> a
-    56:56:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):493 -> a
-    56:56:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):479 -> a
-    56:56:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):232 -> a
-    57:61:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):232:236 -> a
-    62:69:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):353:360 -> a
-    70:81:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):357:368 -> a
-    82:86:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):333:337 -> a
-    82:86:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    87:87:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    87:87:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):337 -> a
-    87:87:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    88:88:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):338:338 -> a
-    88:88:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    89:89:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):338 -> a
-    89:89:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    90:90:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):338:338 -> a
-    90:90:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    91:91:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    91:91:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):339 -> a
-    91:91:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    92:100:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):340:348 -> a
-    92:100:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372 -> a
-    101:102:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):372:373 -> a
-    103:103:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):388:388 -> a
-    104:104:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):388:388 -> a
-    105:114:void reportFinalMethodsInWrapper(java.util.Set):388:397 -> a
-    115:115:void reportFinalMethodsInWrapper(java.util.Set):392:392 -> a
-    116:130: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):403:417 -> a
-    131:131:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    131:131: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):417 -> a
-    132:154:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):423:445 -> a
-    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    155:155:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):445 -> a
-    156:156:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):447:447 -> a
-    157:157:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    157:157:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):447 -> a
-    158:164:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):447:453 -> a
-    165:165:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    165:165:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):453 -> a
-    166:167:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):454:455 -> a
-    168:168:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):462:462 -> a
-    169:169:void finalizeWrappersForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):501:501 -> a
-    170:174:void registerAndProcessWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Collection):536:540 -> a
-    170:174:void finalizeWrappersForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):502 -> a
-    175:181:java.util.List synthesizeWrappers(java.util.Map):506:512 -> a
-    182:182:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):183:183 -> a
-    182:182:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    183:183:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):462:462 -> a
-    183:183:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):466 -> a
-    183:183:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):184 -> a
-    183:183:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    184:185:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):469:470 -> a
-    184:185:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):184 -> a
-    184:185:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    186:186:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):179:179 -> a
-    186:186:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
-    186:186:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    187:201:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):293:307 -> a
-    187:201:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    187:201:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    202:202:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    202:202:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):307 -> a
-    202:202:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    202:202:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    203:203:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):308:308 -> a
-    203:203:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    203:203:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    204:204:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    204:204:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):308 -> a
-    204:204:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    204:204:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    205:209:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):308:312 -> a
-    205:209:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    205:209:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    210:210:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):311:311 -> a
-    210:210:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    210:210:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    211:211:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    211:211:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):314 -> a
-    211:211:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    211:211:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    212:223:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):315:326 -> a
-    212:223:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    212:223:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    224:229:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):378:383 -> a
-    224:229:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):328 -> a
-    224:229:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):188 -> a
-    224:229:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    230:231:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):544:545 -> a
-    230:231:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):189 -> a
-    230:231:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    232:232:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):179:179 -> a
-    232:232:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):550 -> a
-    232:232:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):189 -> a
-    232:232:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    233:233:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):179:179 -> a
-    233:233:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):551 -> a
-    233:233:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):189 -> a
-    233:233:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    234:234:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):551:551 -> a
-    234:234:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):189 -> a
-    234:234:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    235:235:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):546:546 -> a
-    235:235:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):189 -> a
-    235:235:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    236:236:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185:185 -> a
-    236:236:java.util.List synthesizeWrappers(java.util.Map):512 -> a
-    237:245:java.util.List synthesizeWrappers(java.util.Map):513:521 -> a
-    246:246:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:195 -> a
-    246:246:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    247:247:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):179:179 -> a
-    247:247:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):197 -> a
-    247:247:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    248:248:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):462:462 -> a
-    248:248:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):466 -> a
-    248:248:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):197 -> a
-    248:248:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    249:250:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):469:470 -> a
-    249:250:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):197 -> a
-    249:250:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    251:264:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):241:254 -> a
-    251:264:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    251:264:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    265:265:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):254 -> a
-    265:265:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    265:265:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    266:271:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):257:257 -> a
-    266:271:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    266:271:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    278:282:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):264:268 -> a
-    278:282:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    278:282:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    283:283:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):267:267 -> a
-    283:283:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    283:283:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    284:284:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> a
-    284:284:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):270 -> a
-    284:284:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    284:284:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    285:300:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):271:286 -> a
-    285:300:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    285:300:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    301:306:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):378:383 -> a
-    301:306:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):288 -> a
-    301:306:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):201 -> a
-    301:306:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    307:308:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):556:557 -> a
-    307:308:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):202 -> a
-    307:308:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    309:309:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):179:179 -> a
-    309:309:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):561 -> a
-    309:309:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):202 -> a
-    309:309:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    310:310:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):563:563 -> a
-    310:310:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):202 -> a
-    310:310:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    311:311:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):558:558 -> a
-    311:311:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):202 -> a
-    311:311:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    312:312:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198:198 -> a
-    312:312:java.util.List synthesizeWrappers(java.util.Map):521 -> a
-    313:314:java.util.List synthesizeWrappers(java.util.Map):522:523 -> a
-    315:317:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):572:574 -> a
-    318:338:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):573:593 -> a
-    339:344:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):488:493 -> a
-    339:344:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):595 -> a
-    345:345:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    345:345:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):493 -> a
-    345:345:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):595 -> a
-    1:2:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):136:137 -> b
-    1:1:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):170:170 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
-    2:2:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):170 -> c
-    3:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):172:173 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> c
-    5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):173 -> c
-    6:7:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):173:174 -> c
-    1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):142:143 -> d
-    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):123:123 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.t.c.t:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):115:115 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):104:121 -> <init>
+    1:1:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):129:129 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):129 -> a
+    3:6:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):130:133 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    7:7:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):133 -> a
+    8:10:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):149:149 -> a
+    8:10:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):158 -> a
+    11:13:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):159:159 -> a
+    14:15:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map):154:155 -> a
+    16:33:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):209:226 -> a
+    34:37:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):471:474 -> a
+    34:37:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):229 -> a
+    38:46:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):472:480 -> a
+    38:46:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):229 -> a
+    47:52:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):485:490 -> a
+    47:52:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):476 -> a
+    47:52:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):229 -> a
+    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    53:53:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):490 -> a
+    53:53:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):476 -> a
+    53:53:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):229 -> a
+    54:58:com.android.tools.r8.graph.DexProgramClass synthesizeWrapper(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedField):229:233 -> a
+    59:66:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):350:357 -> a
+    67:78:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):354:365 -> a
+    79:83:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):330:334 -> a
+    79:83:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    84:84:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    84:84:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):334 -> a
+    84:84:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    85:85:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):335:335 -> a
+    85:85:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):335 -> a
+    86:86:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    87:87:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):335:335 -> a
+    87:87:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    88:88:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    88:88:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):336 -> a
+    88:88:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    89:97:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):337:345 -> a
+    89:97:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369 -> a
+    98:99:com.android.tools.r8.graph.DexClasspathClass synthesizeClasspathMock(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,boolean):369:370 -> a
+    100:100:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):385:385 -> a
+    101:101:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):385:385 -> a
+    102:111:void reportFinalMethodsInWrapper(java.util.Set):385:394 -> a
+    112:112:void reportFinalMethodsInWrapper(java.util.Set):389:389 -> a
+    113:127: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):400:414 -> a
+    128:128:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    128:128: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):414 -> a
+    129:151:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):420:442 -> a
+    152:152:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    152:152:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):442 -> a
+    153:153:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):444:444 -> a
+    154:154:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    154:154:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):444 -> a
+    155:161:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):444:450 -> a
+    162:162:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    162:162:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):450 -> a
+    163:164:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):451:452 -> a
+    165:165:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):459:459 -> a
+    166:166:void finalizeWrappersForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):498:498 -> a
+    167:171:void registerAndProcessWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,java.util.Collection):533:537 -> a
+    167:171:void finalizeWrappersForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):499 -> a
+    172:178:java.util.List synthesizeWrappers(java.util.Map):503:509 -> a
+    179:179:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):180:180 -> a
+    179:179:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    180:180:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):459:459 -> a
+    180:180:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):463 -> a
+    180:180:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):181 -> a
+    180:180:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    181:182:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):466:467 -> a
+    181:182:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):181 -> a
+    181:182:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    183:183:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):176:176 -> a
+    183:183:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):183 -> a
+    183:183:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    184:198:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):290:304 -> a
+    184:198:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    184:198:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    199:199:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    199:199:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):304 -> a
+    199:199:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    199:199:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    200:200:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):305:305 -> a
+    200:200:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    200:200:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    201:201:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    201:201:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):305 -> a
+    201:201:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    201:201:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    202:206:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):305:309 -> a
+    202:206:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    202:206:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    207:207:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):308:308 -> a
+    207:207:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    207:207:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    208:208:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    208:208:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):311 -> a
+    208:208:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    208:208:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    209:220:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):312:323 -> a
+    209:220:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    209:220:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    221:226:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):375:380 -> a
+    221:226:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):325 -> a
+    221:226:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):185 -> a
+    221:226:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    227:228:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):541:542 -> a
+    227:228:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
+    227:228:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    229:229:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):176:176 -> a
+    229:229:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):547 -> a
+    229:229:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
+    229:229:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    230:230:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):176:176 -> a
+    230:230:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):548 -> a
+    230:230:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
+    230:230:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    231:231:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):548:548 -> a
+    231:231:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
+    231:231:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    232:232:com.android.tools.r8.graph.DexEncodedMethod generateTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):543:543 -> a
+    232:232:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):186 -> a
+    232:232:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    233:233:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):182:182 -> a
+    233:233:java.util.List synthesizeWrappers(java.util.Map):509 -> a
+    234:242:java.util.List synthesizeWrappers(java.util.Map):510:518 -> a
+    243:243:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):192:192 -> a
+    243:243:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    244:244:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):176:176 -> a
+    244:244:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    244:244:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    245:245:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):459:459 -> a
+    245:245:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):463 -> a
+    245:245:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    245:245:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    246:247:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueEncodedField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):466:467 -> a
+    246:247:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):194 -> a
+    246:247:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    248:261:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):238:251 -> a
+    248:261:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    248:261:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    262:262:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    262:262:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):251 -> a
+    262:262:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    262:262:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    263:268:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):254:254 -> a
+    263:268:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    263:268:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    275:279:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):261:265 -> a
+    275:279:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    275:279:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    280:280:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):264:264 -> a
+    280:280:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    280:280:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    281:281:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> a
+    281:281:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):267 -> a
+    281:281:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    281:281:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    282:297:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):268:283 -> a
+    282:297:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    282:297:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    298:303:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):375:380 -> a
+    298:303:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):285 -> a
+    298:303:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):198 -> a
+    298:303:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    304:305:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):553:554 -> a
+    304:305:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):199 -> a
+    304:305:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    306:306:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):176:176 -> a
+    306:306:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):558 -> a
+    306:306:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):199 -> a
+    306:306:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    307:307:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):560:560 -> a
+    307:307:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):199 -> a
+    307:307:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    308:308:com.android.tools.r8.graph.DexEncodedMethod generateVivifiedTypeConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):555:555 -> a
+    308:308:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):199 -> a
+    308:308:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    309:309:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):195:195 -> a
+    309:309:java.util.List synthesizeWrappers(java.util.Map):518 -> a
+    310:311:java.util.List synthesizeWrappers(java.util.Map):519:520 -> a
+    312:314:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):569:571 -> a
+    315:335:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):570:590 -> a
+    336:341:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):485:490 -> a
+    336:341:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):592 -> a
+    342:342:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    342:342:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):490 -> a
+    342:342:com.android.tools.r8.graph.DexEncodedMethod synthesizeConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):592 -> a
+    1:2:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):138:139 -> b
+    1:1:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):167:167 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
+    2:2:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):167 -> c
+    3:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):169:170 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> c
+    5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):170 -> c
+    6:7:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):170:171 -> c
+    1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):144:145 -> d
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):125:125 -> e
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.s.c.t:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet synthesizedMethods -> g
     java.util.concurrent.ConcurrentMap requiredDispatchClasses -> i
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     com.android.tools.r8.utils.InternalOptions options -> c
     java.util.Set emulatedMethods -> f
-    com.android.tools.r8.utils.collections.ProgramMethodSet synthesizedMethods -> g
     java.util.Map emulatedInterfaces -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
     java.util.Map cache -> h
     1:1:void <clinit>():96:96 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):138:138 -> <init>
-    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:146 -> <init>
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):150:154 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):154:154 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):158:158 -> a
-    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):159:160 -> a
-    10:13:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):165:168 -> a
-    14:17:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):170:173 -> a
-    18:23:void initializeEmulatedInterfaceVariables():181:186 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    24:24:void initializeEmulatedInterfaceVariables():186 -> a
-    25:26:void initializeEmulatedInterfaceVariables():189:190 -> a
-    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):197:197 -> a
-    28:28:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
-    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198 -> a
-    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:200 -> a
-    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199:199 -> a
-    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):197:204 -> a
-    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):203:203 -> a
-    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):201:201 -> a
-    43:63:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):215:235 -> a
-    64:75:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:245 -> a
-    76:256:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter.hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):0:180 -> a
-    76:256:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):245 -> a
-    257:258:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):253:254 -> a
-    259:259:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):485:485 -> a
-    259:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):255 -> a
-    260:264:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):266:270 -> a
-    265:265:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):795:795 -> a
-    265:265:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):271 -> a
-    266:266:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
-    267:275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270:278 -> a
-    276:276:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790:790 -> a
-    276:276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279 -> a
-    277:277:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
-    277:277:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790 -> a
-    277:277:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279 -> a
-    278:278:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790:790 -> a
-    278:278:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):279 -> a
-    279:279:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):280:280 -> a
-    280:308:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278:306 -> a
-    309:310:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):822:823 -> a
-    309:310:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):306 -> a
-    311:311:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):307:307 -> a
-    312:312:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834:834 -> a
-    312:312:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
-    313:313:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):830:830 -> a
-    313:313:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834 -> a
-    313:313:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
-    314:314:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):309:309 -> a
-    315:330:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):307:322 -> a
-    331:331:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    331:331:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):322 -> a
-    332:343:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):323:334 -> a
-    344:344:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
-    344:344:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):336 -> a
-    345:346:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):336:337 -> a
-    347:354:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335:342 -> a
-    355:361:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:346 -> a
-    362:390:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):344:372 -> a
-    391:391:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    391:391:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):372 -> a
-    392:393:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):377:378 -> a
-    394:394:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):844:844 -> a
-    394:394:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):380 -> a
-    395:395:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):840:840 -> a
-    395:395:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):844 -> a
-    395:395:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):380 -> a
-    396:397:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):381:382 -> a
-    398:404:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378:384 -> a
-    405:405:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834:834 -> a
-    405:405:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):386 -> a
-    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):830:830 -> a
-    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834 -> a
-    406:406:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):386 -> a
-    407:408:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):387:388 -> a
-    409:425:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):384:400 -> a
-    426:434:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):396:404 -> a
-    435:437:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):368:370 -> a
-    438:438:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    438:438:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    438:438:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
-    439:482:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370:413 -> a
-    483:483: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):473:473 -> a
-    483:483:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    484:484:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    484:484: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):473 -> a
-    484:484:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    485:488: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):473:476 -> a
-    485:488:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    489:491:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):590:592 -> a
-    489:491: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):478 -> a
-    489:491:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    492:492:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):589:589 -> a
-    492:492: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):478 -> a
-    492:492:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    493:494: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):479:480 -> a
-    493:494:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    495:495: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):476:476 -> a
-    495:495:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    496:496:java.util.Set lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexLibraryClass):274:274 -> a
-    497:497:com.android.tools.r8.graph.GraphLense$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense.builder():410:410 -> a
-    497:497:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1019 -> a
-    498:499:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1020:1021 -> a
-    500:501:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1014:1015 -> a
-    500:501:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1022 -> a
-    502:512:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1023:1033 -> a
-    513:513:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):489:489 -> a
-    514:514:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    514:514:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):489 -> a
-    515:519:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):489:493 -> a
-    520:525:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):548:553 -> a
-    526:526:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    526:526:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):553 -> a
-    527:536:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):555:564 -> a
-    537:537:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    537:537:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):564 -> a
-    538:538:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):566:566 -> a
-    539:544:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):597:602 -> a
-    545:551:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):601:607 -> a
-    552:552:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
-    552:552:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):609 -> a
-    553:553:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):609:609 -> a
-    554:572:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):608:626 -> a
-    573:573:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    573:573:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):626 -> a
-    574:574:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):627:627 -> a
-    575:581:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):573:579 -> a
-    575:581:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):627 -> a
-    582:582:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    582:582:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):579 -> a
-    582:582:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):627 -> a
-    583:583:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):581:581 -> a
-    583:583:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):627 -> a
-    584:589:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):628:633 -> a
-    590:590:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):631:631 -> a
-    591:605:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):628:642 -> a
-    606:606:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    606:606:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642 -> a
-    607:611:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:647 -> a
-    612:612:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
-    612:612:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651 -> a
-    613:614:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651:652 -> a
-    615:615:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):650:650 -> a
-    616:630:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:661 -> a
-    631:633:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):590:592 -> a
-    631:633:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
-    634:634:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):589:589 -> a
-    634:634:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
-    635:635:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661:661 -> a
-    636:636:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):659:659 -> a
-    637:681:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):658:702 -> a
-    682:683:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):720:721 -> a
-    684:684:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    684:684:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):721 -> a
-    685:689:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):725:729 -> a
-    690:690:java.lang.String getCompanionClassDescriptor(java.lang.String):736:736 -> a
-    691:694:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):741:744 -> a
-    695:699:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):753:757 -> a
-    700:709:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):806:815 -> a
-    710:710:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):812:812 -> a
-    711:711:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):830:830 -> a
-    712:712:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834:834 -> a
-    713:713:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):830:830 -> a
-    713:713:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):834 -> a
-    714:716:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):895:897 -> a
-    717:717:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):974:974 -> a
-    718:718:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    718:718:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):974 -> a
-    719:722:java.util.Map processEmulatedInterfaceHierarchy():536:539 -> a
-    719:722:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):517 -> a
-    719:722:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    723:724:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):518:519 -> a
-    723:724:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    725:725:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    725:725:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):519 -> a
-    725:725:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    726:730:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):521:525 -> a
-    726:730:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    731:731:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):524:524 -> a
-    731:731:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    732:732:boolean isInMainDexList(com.android.tools.r8.graph.DexType):784:784 -> a
-    732:732:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):527 -> a
-    732:732:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    733:734:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):527:528 -> a
-    733:734:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):975 -> a
-    735:745:void duplicateEmulatedInterfaces():905:915 -> a
-    735:745:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    746:746:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    746:746:void duplicateEmulatedInterfaces():915 -> a
-    746:746:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    747:748:void duplicateEmulatedInterfaces():916:917 -> a
-    747:748:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    749:749:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    749:749:void duplicateEmulatedInterfaces():917 -> a
-    749:749:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    750:750:void duplicateEmulatedInterfaces():918:918 -> a
-    750:750:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    751:759:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):940:948 -> a
-    751:759:void duplicateEmulatedInterfaces():919 -> a
-    751:759:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    760:760:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    760:760:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):948 -> a
-    760:760:void duplicateEmulatedInterfaces():919 -> a
-    760:760:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    761:768:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):950:957 -> a
-    761:768:void duplicateEmulatedInterfaces():919 -> a
-    761:768:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    769:779:void duplicateEmulatedInterfaces():920:930 -> a
-    769:779:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    780:785:void duplicateEmulatedInterfaces():929:934 -> a
-    780:785:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
-    786:786:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981:981 -> a
-    787:789:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1038:1040 -> a
-    787:789:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    790:791:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1014:1015 -> a
-    790:791:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1041 -> a
-    790:791:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    792:796:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1042:1046 -> a
-    792:796:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    797:802:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987:992 -> a
-    803:803:boolean isInMainDexList(com.android.tools.r8.graph.DexType):784:784 -> a
-    803:803:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):992 -> a
-    804:808:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):992:996 -> a
-    809:809:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    809:809:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):996 -> a
-    810:811:void renameEmulatedInterfaces():850:851 -> a
-    810:811:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    812:820:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):863:871 -> a
-    812:820:void renameEmulatedInterfaces():852 -> a
-    812:820:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    821:824:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):882:885 -> a
-    821:824:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):871 -> a
-    821:824:void renameEmulatedInterfaces():852 -> a
-    821:824:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    825:825:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):873:873 -> a
-    825:825:void renameEmulatedInterfaces():852 -> a
-    825:825:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    826:826:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    826:826:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):873 -> a
-    826:826:void renameEmulatedInterfaces():852 -> a
-    826:826:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    827:827:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):875:875 -> a
-    827:827:void renameEmulatedInterfaces():852 -> a
-    827:827:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    828:830:void renameEmulatedInterfaces():853:855 -> a
-    828:830:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    831:833:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):889:891 -> a
-    831:833:void renameEmulatedInterfaces():856 -> a
-    831:833:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):997 -> a
-    834:834:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1000:1000 -> a
-    835:837:void clear():1007:1009 -> a
-    835:837:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1003 -> a
-    838:852:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1050:1064 -> a
-    853:853:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1057:1057 -> a
-    854:860:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1120:1126 -> a
-    861:861: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):1142:1142 -> a
-    862:863: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):1155:1156 -> a
-    862:863: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):1146 -> a
-    864:864:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    864:864: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):1156 -> a
-    864:864: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):1146 -> a
-    865:868:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1114 -> a
-    865:868: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):1158 -> a
-    865:868: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):1146 -> a
-    869:871: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):1159:1161 -> a
-    869:871: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):1146 -> a
-    872:872:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):485:485 -> a
-    872:872: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):1167 -> a
-    872:872: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):1146 -> a
-    873:899: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):1172:1198 -> a
-    873:899: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):1146 -> a
-    900:900: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):1147:1147 -> a
-    901:903: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):1162:1164 -> a
-    901:903: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):1146 -> a
-    904:904:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    904:904: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):1164 -> a
-    904:904: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):1146 -> a
-    905:905: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):1164:1164 -> a
-    905:905: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):1146 -> a
-    906:907:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1203:1204 -> a
-    908:908:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    908:908:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1206 -> a
-    909:913:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1207:1211 -> a
-    914:914:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    914:914:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1212 -> a
-    915:915:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1214:1214 -> a
-    1:2:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):498:499 -> b
-    3:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):713:714 -> b
-    5:5:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):707:707 -> b
-    5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):715 -> b
-    6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):716:716 -> b
-    7:7:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):762:762 -> b
-    8:11:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1114 -> b
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):209:209 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:776 -> c
-    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):762:762 -> c
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776 -> c
-    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> c
-    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778:780 -> c
-    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1130:1131 -> c
-    13:13:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):771:771 -> c
-    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1132 -> c
-    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1134:1134 -> c
-    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
-    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1134 -> c
-    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1135:1135 -> c
-    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> c
-    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1135 -> c
-    1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):425:428 -> d
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> d
-    5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):428 -> d
-    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):436:436 -> d
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> d
-    7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):436 -> d
-    8:34:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):436:462 -> d
-    35:35:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):209:209 -> d
-    35:35:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):462 -> d
-    36:36:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):463:463 -> d
-    37:37:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1101:1101 -> d
+    2:37:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):109:144 -> <init>
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):148:152 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):152:152 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):156:156 -> a
+    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):157:158 -> a
+    10:13:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):163:166 -> a
+    14:17:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):168:171 -> a
+    18:23:void initializeEmulatedInterfaceVariables():179:184 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    24:24:void initializeEmulatedInterfaceVariables():184 -> a
+    25:26:void initializeEmulatedInterfaceVariables():187:188 -> a
+    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):195:195 -> a
+    28:28:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
+    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):196 -> a
+    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):196:198 -> a
+    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):197:197 -> a
+    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):195:202 -> a
+    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):201:201 -> a
+    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199:199 -> a
+    43:63:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):213:233 -> a
+    64:75:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:243 -> a
+    76:250:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter.hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):0:174 -> a
+    76:250:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243 -> a
+    251:252:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
+    253:253:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):483:483 -> a
+    253:253:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):253 -> a
+    254:258:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264:268 -> a
+    259:259:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):793:793 -> a
+    259:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):269 -> a
+    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270:270 -> a
+    261:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):268:276 -> a
+    270:270:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788:788 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277 -> a
+    271:271:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
+    271:271:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788 -> a
+    271:271:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277 -> a
+    272:272:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788:788 -> a
+    272:272:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):277 -> a
+    273:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):278:278 -> a
+    274:302:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):276:304 -> a
+    303:304:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):820:821 -> a
+    303:304:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304 -> a
+    305:305:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
+    306:306:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832:832 -> a
+    306:306:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):306 -> a
+    307:307:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):828:828 -> a
+    307:307:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832 -> a
+    307:307:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):306 -> a
+    308:308:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):307:307 -> a
+    309:324:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):305:320 -> a
+    325:325:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    325:325:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320 -> a
+    326:337:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321:332 -> a
+    338:338:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
+    338:338:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334 -> a
+    339:340:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):334:335 -> a
+    341:348:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:340 -> a
+    349:355:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:344 -> a
+    356:384:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):342:370 -> a
+    385:385:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    385:385:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):370 -> a
+    386:387:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):375:376 -> a
+    388:388:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):842:842 -> a
+    388:388:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378 -> a
+    389:389:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):838:838 -> a
+    389:389:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):842 -> a
+    389:389:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):378 -> a
+    390:391:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):379:380 -> a
+    392:398:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):376:382 -> a
+    399:399:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832:832 -> a
+    399:399:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):384 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):828:828 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832 -> a
+    400:400:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):384 -> a
+    401:402:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):385:386 -> a
+    403:419:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):382:398 -> a
+    420:428:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):394:402 -> a
+    429:431:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):366:368 -> a
+    432:432:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    432:432:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    432:432:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):368 -> a
+    433:476:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):368:411 -> a
+    477:477: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):471:471 -> a
+    477:477:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    478:478:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    478:478: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):471 -> a
+    478:478:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    479:482: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):471:474 -> a
+    479:482:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    483:485:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):588:590 -> a
+    483:485: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):476 -> a
+    483:485:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    486:486:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):587:587 -> a
+    486:486: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):476 -> a
+    486:486:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    487:488: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):477:478 -> a
+    487:488:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    489:489: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):474:474 -> a
+    489:489:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413 -> a
+    490:490:java.util.Set lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexLibraryClass):272:272 -> a
+    491:491:com.android.tools.r8.graph.GraphLense$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense.builder():410:410 -> a
+    491:491:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1021 -> a
+    492:493:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1022:1023 -> a
+    494:495:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1016:1017 -> a
+    494:495:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1024 -> a
+    496:506:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1025:1035 -> a
+    507:507:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):487:487 -> a
+    508:508:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    508:508:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):487 -> a
+    509:513:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):487:491 -> a
+    514:519:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):546:551 -> a
+    520:520:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    520:520:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):551 -> a
+    521:530:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):553:562 -> a
+    531:531:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    531:531:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):562 -> a
+    532:532:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):564:564 -> a
+    533:538:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):595:600 -> a
+    539:545:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):599:605 -> a
+    546:546:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
+    546:546:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):607 -> a
+    547:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):607:607 -> a
+    548:566:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):606:624 -> a
+    567:567:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    567:567:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):624 -> a
+    568:568:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):625:625 -> a
+    569:575:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):571:577 -> a
+    569:575:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):625 -> a
+    576:576:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    576:576:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):577 -> a
+    576:576:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):625 -> a
+    577:577:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):579:579 -> a
+    577:577:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):625 -> a
+    578:583:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):626:631 -> a
+    584:584:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):629:629 -> a
+    585:599:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):626:640 -> a
+    600:600:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    600:600:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640 -> a
+    601:605:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):641:645 -> a
+    606:606:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
+    606:606:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):649 -> a
+    607:608:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):649:650 -> a
+    609:609:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    610:624:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):645:659 -> a
+    625:627:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):588:590 -> a
+    625:627:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):659 -> a
+    628:628:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):587:587 -> a
+    628:628:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):659 -> a
+    629:629:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):659:659 -> a
+    630:630:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):657:657 -> a
+    631:675:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):656:700 -> a
+    676:677:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):718:719 -> a
+    678:678:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    678:678:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):719 -> a
+    679:683:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):723:727 -> a
+    684:684:java.lang.String getCompanionClassDescriptor(java.lang.String):734:734 -> a
+    685:688:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):739:742 -> a
+    689:693:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):751:755 -> a
+    694:703:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):804:813 -> a
+    704:704:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):810:810 -> a
+    705:705:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):828:828 -> a
+    706:706:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832:832 -> a
+    707:707:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):828:828 -> a
+    707:707:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):832 -> a
+    708:708:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):893:893 -> a
+    709:711:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):897:899 -> a
+    709:711:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):893 -> a
+    712:712:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):976:976 -> a
+    713:713:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    713:713:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):976 -> a
+    714:717:java.util.Map processEmulatedInterfaceHierarchy():534:537 -> a
+    714:717:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):515 -> a
+    714:717:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    718:719:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):516:517 -> a
+    718:719:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    720:720:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    720:720:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):517 -> a
+    720:720:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    721:725:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):519:523 -> a
+    721:725:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    726:726:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):522:522 -> a
+    726:726:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    727:727:boolean isInMainDexList(com.android.tools.r8.graph.DexType):782:782 -> a
+    727:727:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):525 -> a
+    727:727:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    728:729:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):525:526 -> a
+    728:729:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):977 -> a
+    730:740:void duplicateEmulatedInterfaces():907:917 -> a
+    730:740:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    741:741:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    741:741:void duplicateEmulatedInterfaces():917 -> a
+    741:741:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    742:743:void duplicateEmulatedInterfaces():918:919 -> a
+    742:743:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    744:744:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    744:744:void duplicateEmulatedInterfaces():919 -> a
+    744:744:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    745:745:void duplicateEmulatedInterfaces():920:920 -> a
+    745:745:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    746:754:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):942:950 -> a
+    746:754:void duplicateEmulatedInterfaces():921 -> a
+    746:754:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    755:755:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    755:755:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):950 -> a
+    755:755:void duplicateEmulatedInterfaces():921 -> a
+    755:755:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    756:763:java.util.List emulatedInterfacesOf(com.android.tools.r8.graph.DexClass):952:959 -> a
+    756:763:void duplicateEmulatedInterfaces():921 -> a
+    756:763:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    764:774:void duplicateEmulatedInterfaces():922:932 -> a
+    764:774:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    775:780:void duplicateEmulatedInterfaces():931:936 -> a
+    775:780:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979 -> a
+    781:781:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):983:983 -> a
+    782:784:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1040:1042 -> a
+    782:784:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):983 -> a
+    785:786:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1016:1017 -> a
+    785:786:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1043 -> a
+    785:786:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):983 -> a
+    787:791:void processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1044:1048 -> a
+    787:791:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):983 -> a
+    792:797:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):989:994 -> a
+    798:798:boolean isInMainDexList(com.android.tools.r8.graph.DexType):782:782 -> a
+    798:798:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):994 -> a
+    799:803:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):994:998 -> a
+    804:804:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    804:804:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):998 -> a
+    805:806:void renameEmulatedInterfaces():848:849 -> a
+    805:806:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    807:815:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):861:869 -> a
+    807:815:void renameEmulatedInterfaces():850 -> a
+    807:815:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    816:819:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):880:883 -> a
+    816:819:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):869 -> a
+    816:819:void renameEmulatedInterfaces():850 -> a
+    816:819:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    820:820:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):871:871 -> a
+    820:820:void renameEmulatedInterfaces():850 -> a
+    820:820:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    821:821:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    821:821:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):871 -> a
+    821:821:void renameEmulatedInterfaces():850 -> a
+    821:821:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    822:822:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):873:873 -> a
+    822:822:void renameEmulatedInterfaces():850 -> a
+    822:822:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    823:825:void renameEmulatedInterfaces():851:853 -> a
+    823:825:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    826:828:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):887:889 -> a
+    826:828:void renameEmulatedInterfaces():854 -> a
+    826:828:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):999 -> a
+    829:829:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002:1002 -> a
+    830:832:void clear():1009:1011 -> a
+    830:832:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1005 -> a
+    833:847:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1052:1066 -> a
+    848:848:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1059:1059 -> a
+    849:855:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1122:1128 -> a
+    856:856: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):1144:1144 -> a
+    857:858: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):1157:1158 -> a
+    857:858: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):1148 -> a
+    859:859:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    859:859: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):1158 -> a
+    859:859: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):1148 -> a
+    860:863:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1116 -> a
+    860:863: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):1160 -> a
+    860:863: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):1148 -> a
+    864:866: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):1161:1163 -> a
+    864:866: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):1148 -> a
+    867:867:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):483:483 -> a
+    867:867: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):1169 -> a
+    867:867: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):1148 -> a
+    868:894: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):1174:1200 -> a
+    868:894: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):1148 -> a
+    895:895: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):1149:1149 -> a
+    896:898: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):1164:1166 -> a
+    896:898: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):1148 -> a
+    899:899:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    899:899: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):1166 -> a
+    899:899: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):1148 -> a
+    900:900: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):1166:1166 -> a
+    900:900: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):1148 -> a
+    901:902:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1205:1206 -> a
+    903:903:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    903:903:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1208 -> a
+    904:908:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1209:1213 -> a
+    909:909:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    909:909:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1214 -> a
+    910:910:void reportDependencyEdge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1216:1216 -> a
+    1:2:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):496:497 -> b
+    3:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):711:712 -> b
+    5:5:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):705:705 -> b
+    5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):713 -> b
+    6:6:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):714:714 -> b
+    7:7:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):760:760 -> b
+    8:11:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1113:1116 -> b
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):207:207 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):774:774 -> c
+    3:3:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):760:760 -> c
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):774 -> c
+    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):774:777 -> c
+    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:778 -> c
+    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1132:1133 -> c
+    13:13:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType):769:769 -> c
+    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1134 -> c
+    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1136:1136 -> c
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1136 -> c
+    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1137:1137 -> c
+    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> c
+    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1137 -> c
+    1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):423:426 -> d
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> d
+    5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):426 -> d
+    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):434:434 -> d
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> d
+    7:7:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):434 -> d
+    8:34:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):434:460 -> d
+    35:35:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):207:207 -> d
+    35:35:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):460 -> d
+    36:36:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):461:461 -> d
+    37:37:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1103:1103 -> d
     38:38:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> d
-    38:38:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1101 -> d
-    39:39:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1102:1102 -> d
-    40:40:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):762:762 -> d
-    40:40:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1103 -> d
-    41:43:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1103:1105 -> d
-    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):507:512 -> e
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):844:844 -> e
-    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):840:840 -> e
-    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):844 -> e
-    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790:790 -> f
-    2:2:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> f
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790 -> f
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):790:790 -> f
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.t.c.v:
+    38:38:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1103 -> d
+    39:39:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1104:1104 -> d
+    40:40:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):760:760 -> d
+    40:40:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1105 -> d
+    41:43:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1105:1107 -> d
+    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):505:510 -> e
+    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):842:842 -> e
+    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):838:838 -> e
+    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):842 -> e
+    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788:788 -> f
+    2:2:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> f
+    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788 -> f
+    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):788:788 -> f
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.s.c.t$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>():131:135 -> <clinit>
+    1:1:void <init>(java.lang.String,int):127:127 -> <init>
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.s.c.v:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -32649,16 +32972,16 @@
     9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):78 -> a
     21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):84:96 -> a
     34:40:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):95:101 -> a
-    41:41:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
+    41:41:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
     41:41:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):101 -> a
     42:45:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):105:108 -> a
     46:47:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):88:89 -> a
-    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     48:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):89 -> a
     49:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):89:89 -> a
     50:51:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):79:80 -> a
-    52:52:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    52:52:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     52:52:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     52:52:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80 -> a
     53:53:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):80:80 -> a
@@ -32667,7 +32990,7 @@
     66:68:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):332:334 -> a
     66:68:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):353 -> a
     66:68:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):112 -> a
-    69:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    69:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     69:69:com.android.tools.r8.graph.DexClass definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):334 -> a
     69:69:boolean interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):353 -> a
     69:69:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):112 -> a
@@ -32677,44 +33000,44 @@
     97:100:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):376:379 -> a
     97:100:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133 -> a
     101:111:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):134:144 -> a
-    112:112:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
+    112:112:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
     112:112:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):144 -> a
     113:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):146:164 -> a
     132:138:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):163:169 -> a
-    139:139:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
+    139:139:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
     139:139:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):169 -> a
     140:142:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):173:175 -> a
     143:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):160:161 -> a
-    145:145:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    145:145:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     145:145:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     145:145:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):161 -> a
     146:165:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):161:180 -> a
     166:166:boolean isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):377:377 -> a
     166:166:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):133 -> a
     167:185:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):184:202 -> a
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):748:748 -> a
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):746:746 -> a
     186:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):202 -> a
     187:208:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GraphLense$Builder):203:224 -> a
     209:213:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):228:232 -> a
     214:238:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):236:260 -> a
-    239:239:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):795:795 -> a
+    239:239:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):793:793 -> a
     239:239:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):260 -> a
     240:264:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
     240:264:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):262 -> a
-    265:274:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):264:273 -> a
-    275:275:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    275:275:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):273 -> a
-    276:277:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set) -> a
-    278:332:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):253:307 -> a
-    333:337:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):367:371 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.t.c.v$a:
+    265:275:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):264:274 -> a
+    276:276:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    276:276:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):274 -> a
+    277:278:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):276:277 -> a
+    279:333:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):253:307 -> a
+    334:338:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):367:371 -> a
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense -> com.android.tools.r8.s.c.v$a:
     int $r8$clinit -> 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):394:394 -> <init>
     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):406:406 -> mapInvocationType
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.t.c.u:
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLense$Builder -> com.android.tools.r8.s.c.u:
     1:1:void <init>():413:413 -> <init>
     1:4:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):416:419 -> a
-com.android.tools.r8.ir.desugar.LambdaAccessorMethodWithSynthesizedCode -> com.android.tools.r8.t.c.w:
+com.android.tools.r8.ir.desugar.LambdaAccessorMethodWithSynthesizedCode -> com.android.tools.r8.s.c.w:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):15:15 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):20:20 -> a
     1:15:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):26:40 -> b
@@ -32723,7 +33046,7 @@
     18:18:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):30:30 -> b
     1:1:java.util.function.Consumer getRegistryCallback():25:25 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():20:20 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.t.c.x:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.s.c.x:
     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
@@ -32735,7 +33058,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.t.c.y:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSynthesizedCode -> com.android.tools.r8.s.c.y:
     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>
@@ -32746,58 +33069,61 @@
     6:7:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):38:39 -> b
     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.t.c.E:
-    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
-    boolean $assertionsDisabled -> k
-    java.util.function.Supplier lazyDexClass -> j
-    com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> a
-    com.android.tools.r8.graph.DexType type -> b
-    com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> c
-    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>():62:62 -> <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):80:80 -> <init>
-    2:37: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):71:106 -> <init>
-    1:1: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):112:112 -> a
-    2:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):117:137 -> a
-    2:22: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):112 -> a
-    23:28:com.android.tools.r8.graph.DexField getCaptureField(int):200:205 -> a
-    29:29:com.android.tools.r8.graph.DexField getCaptureField(int):202:202 -> a
-    30:37:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):213:220 -> a
-    38:38:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):341:341 -> a
-    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):364:386 -> a
-    39:61:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
-    62:62:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):386 -> a
-    62:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
-    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):386:409 -> a
-    63:86:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
-    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):408:408 -> a
-    87:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
-    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.DexType):403:403 -> a
-    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):342 -> a
-    89:102:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):346:359 -> a
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):416:416 -> a
-    103:105:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):357 -> a
-    108:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.DexType):419:442 -> a
-    108:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):357 -> a
-    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):448:463 -> a
-    132:147:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):354 -> a
-    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.DexType):460:464 -> a
-    148:152:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):354 -> a
-    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.DexType):470:490 -> a
-    153:173:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):352 -> a
-    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.DexType):495:497 -> a
-    174:176:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):350 -> a
-    177:177:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.DexType):348:348 -> a
-    178:180:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():501:503 -> a
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.s.c.E:
+    java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> d
+    boolean $assertionsDisabled -> l
+    com.android.tools.r8.graph.DexField lambdaField -> g
+    com.android.tools.r8.ir.desugar.LambdaClass$Target target -> h
+    java.util.function.Supplier lazyDexClass -> k
+    com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> b
+    com.android.tools.r8.graph.DexType type -> c
+    com.android.tools.r8.graph.DexMethod classConstructor -> f
+    com.android.tools.r8.graph.DexMethod constructor -> e
+    java.util.Collection synthesizedFrom -> j
+    1:1:void <clinit>():64:64 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):84:84 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):74:111 -> <init>
+    1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.LambdaDescriptor):117:137 -> a
+    22:27:com.android.tools.r8.graph.DexField getCaptureField(int):200:205 -> a
+    28:28:com.android.tools.r8.graph.DexField getCaptureField(int):202:202 -> a
+    29:36:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):213:220 -> a
+    37:37:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):341:341 -> a
+    38:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):364:388 -> a
+    38:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):342 -> a
+    63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):389 -> a
+    63:63:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):342 -> a
+    64:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):389:412 -> a
+    64:87:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):342 -> a
+    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):411:411 -> a
+    88:88:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):342 -> a
+    89:89:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):406:406 -> a
+    89:89:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):342 -> a
+    90:103:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):346:359 -> a
+    104:106:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):419:419 -> a
+    104:106:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):357 -> a
+    109:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):422:444 -> a
+    109:131:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):357 -> a
+    132:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createInstanceMethodTarget(com.android.tools.r8.graph.ProgramMethod):443:446 -> a
+    132:135:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):357 -> a
+    136:151:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):452:467 -> a
+    136:151:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):354 -> a
+    152:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createStaticMethodTarget(com.android.tools.r8.graph.ProgramMethod):464:468 -> a
+    152:156:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):354 -> a
+    157:177:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):474:494 -> a
+    157:177:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):352 -> a
+    178:180:com.android.tools.r8.ir.desugar.LambdaClass$Target createConstructorTarget(com.android.tools.r8.graph.ProgramMethod):493:495 -> a
+    178:180:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):352 -> a
+    181:183:com.android.tools.r8.ir.desugar.LambdaClass$Target createInterfaceMethodTarget(com.android.tools.r8.graph.ProgramMethod):500:502 -> a
+    181:183:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):350 -> a
+    184:184:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):348:348 -> a
+    185:187:com.android.tools.r8.graph.DexString generateUniqueLambdaMethodName():506:508 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():141:141 -> b
     2:10:long computeChecksumForSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):188:196 -> b
     1:1:boolean isStateless():209:209 -> c
-    2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():186:186 -> c
+    2:2:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():188:188 -> c
     2:2:boolean isStateless():209 -> c
     1:13:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():145:157 -> d
     14:17:com.android.tools.r8.graph.DexTypeList buildInterfaces():332:335 -> d
@@ -32809,92 +33135,94 @@
     41:49:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():166 -> d
     50:62:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():262:274 -> d
     50:62:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
-    63:63:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> d
+    63:63:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> d
     63:63:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():274 -> d
     63:63:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
     64:76:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():274:286 -> d
     64:76:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
-    77:77:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> d
+    77:77:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> d
     77:77:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():286 -> d
     77:77:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
     78:78:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeDirectMethods():286:286 -> d
     78:78:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> d
     79:89:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):225:235 -> d
     79:89:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
-    90:90:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> d
+    90:90:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> d
     90:90:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):235 -> d
     90:90:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
     91:109:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):235:253 -> d
     91:109:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
-    110:110:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> d
+    110:110:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> d
     110:110:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):253 -> d
     110:110:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
     111:111:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):253:253 -> d
     111:111:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168 -> d
     112:121:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:177 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.t.c.z:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.s.c.z:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:1:void <clinit>():738:738 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):740:741 -> <init>
-    1:1:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):747:747 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.LambdaClass$Target.programDefinitionFor(com.android.tools.r8.graph.DexType):541:541 -> a
-    2:2:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):747 -> a
-    3:16:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):748:761 -> a
-    17:17:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    17:17:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):761 -> a
-    18:22:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):766:770 -> a
-    23:23:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):768:768 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.t.c.A:
+    1:1:void <clinit>():726:726 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):728:729 -> <init>
+    1:15:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):735:749 -> a
+    16:16:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    16:16:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):749 -> a
+    17:21:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):754:758 -> a
+    22:22:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):756:756 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.s.c.A:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:1:void <clinit>():657:657 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):659:660 -> <init>
-    1:8:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):666:673 -> a
-    9:22:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):684:697 -> a
-    23:23:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    23:23:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):697 -> a
-    24:25:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):699:700 -> a
-    26:29:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):709:712 -> a
-    30:54:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    30:54:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):713 -> a
-    55:67:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):713:725 -> a
-    68:68:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    68:68:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):725 -> a
-    69:70:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):731:732 -> a
-    71:71:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):728:728 -> a
-    1:24:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):680:703 -> b
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.t.c.B:
+    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:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):653:657 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    6:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):657 -> a
+    7:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):657:660 -> a
+    11:24:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):671:684 -> a
+    25:25:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):684 -> a
+    26:27:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):686:687 -> a
+    28:31:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):696:699 -> a
+    32:56:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
+    32:56:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):700 -> a
+    57:71:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):700:714 -> a
+    72:72:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    72:72:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):714 -> a
+    73:76:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):717:720 -> a
+    77:77:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):715:715 -> a
+    1:24:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):667:690 -> b
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.s.c.B:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> g
-    1:1:void <clinit>():605:605 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):607:608 -> <init>
-    1:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):615:652 -> a
-    39:52:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):626:639 -> a
-    53:53:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    53:53:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):639 -> a
-    54:58:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):641:645 -> a
-    59:59:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):644:644 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.t.c.C:
-    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):573:573 -> <init>
+    1:1:void <clinit>():592:592 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):594:595 -> <init>
+    1:2:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):602:603 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    3:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):603 -> a
+    4:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):603:639 -> a
+    41:54:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):613:626 -> a
+    55:55:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    55:55:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):626 -> a
+    56:60:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):628:632 -> a
+    61:61:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):631:631 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.s.c.C:
+    1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):560:560 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.t.c.D:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.s.c.D:
     com.android.tools.r8.graph.ProgramMethod target -> g
-    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):588:589 -> <init>
-    1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):595:597 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.t.c.E$a:
+    1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):575:576 -> <init>
+    1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):582:584 -> a
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.s.c.E$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
     boolean hasEnsuredAccessibility -> c
     com.android.tools.r8.graph.ProgramMethod accessibilityBridge -> d
-    1:1:void <clinit>():509:509 -> <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):517:521 -> <init>
+    1:1:void <clinit>():514:514 -> <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):522:526 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):537:537 -> a
-    1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):529:533 -> b
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.t.c.F:
+    1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):534:538 -> b
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.s.c.F:
     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>
@@ -32902,13 +33230,13 @@
     1: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.t.c.G:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSynthesizedCode -> com.android.tools.r8.s.c.G:
     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
     1:3:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):24:26 -> b
     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.t.c.H:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.s.c.H:
     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>
@@ -32918,7 +33246,7 @@
     1:8:boolean equals(java.lang.Object):64:71 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:3:int hashCode():57:59 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.t.c.I:
+com.android.tools.r8.ir.desugar.LambdaConstructorSynthesizedCode -> com.android.tools.r8.s.c.I:
     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
     1:1:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.desugar.LambdaSynthesizedCode.dexItemFactory():24:24 -> b
@@ -32926,9 +33254,8 @@
     2:5:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):25:28 -> b
     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.t.c.J:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.s.c.J:
     boolean $assertionsDisabled -> m
-    int $r8$clinit -> n
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     com.android.tools.r8.graph.DexType targetHolder -> k
     com.android.tools.r8.graph.DexMethod mainMethod -> b
@@ -32941,47 +33268,45 @@
     java.util.List interfaces -> g
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> l
     com.android.tools.r8.graph.DexTypeList captures -> i
-    1:8:void <clinit>():28:35 -> <clinit>
-    1:1:void <init>():52:52 -> <init>
-    2:19:void <init>():44:61 -> <init>
-    20:20:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):77:77 -> <init>
-    21:79:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):44:102 -> <init>
-    1:39:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):117:155 -> a
-    40:41:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):149:150 -> a
-    42:43:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):142:143 -> a
-    44:50:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):124:130 -> a
-    51:51:boolean isPrivateInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):166:166 -> a
-    51:51:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):130 -> a
-    52:53:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):130:131 -> a
-    54:54:boolean isPublicizedInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):131 -> a
-    55:64:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):128:137 -> a
-    65:66:boolean isInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):160:161 -> a
-    67:68:boolean delegatesToLambdaImplMethod():180:181 -> a
-    69:85:boolean needsAccessor(com.android.tools.r8.graph.DexType):191:207 -> a
-    86:103:boolean needsAccessor(com.android.tools.r8.graph.DexType):204:221 -> a
-    104:127:boolean needsAccessor(com.android.tools.r8.graph.DexType):220:243 -> a
-    128:129:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexProgramClass):252:253 -> a
-    130:130:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):269:269 -> a
-    131:134:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):257:260 -> a
-    131:134:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):269 -> a
-    135:159:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):270:294 -> a
-    160:170:boolean isEnforcedSignatureValid(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):407:417 -> a
-    160:170:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):294 -> a
-    171:196:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):302:327 -> a
-    197:227:void extractAltMetafactory(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Consumer,java.util.function.Consumer):348:378 -> a
-    197:227:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):327 -> a
-    228:229:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):296:297 -> a
-    230:231:void lambda$infer$0(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):331:332 -> a
-    232:236:java.util.List getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy):385:389 -> a
-    237:243:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):394:400 -> a
-    244:244:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):395:395 -> a
-    245:253:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):429:437 -> a
-    254:257:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):436:439 -> a
+    1:8:void <clinit>():29:36 -> <clinit>
+    1:1:void <init>():53:53 -> <init>
+    2:19:void <init>():45:62 -> <init>
+    20:20:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):78:78 -> <init>
+    21:78:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):45:102 -> <init>
+    1:41:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):117:157 -> a
+    42:43:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):151:152 -> a
+    44:45:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):144:145 -> a
+    46:53:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):125:132 -> a
+    54:54:boolean isPrivateInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> a
+    54:54:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132 -> a
+    55:56:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):132:133 -> a
+    57:57:boolean isPublicizedInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):173:173 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    58:67:com.android.tools.r8.graph.DexEncodedMethod lookupTargetMethod(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):130:139 -> a
+    68:69:boolean isInstanceMethod(com.android.tools.r8.graph.DexEncodedMethod):162:163 -> a
+    70:70:boolean verifyTargetFoundInClass(com.android.tools.r8.graph.DexType):177:177 -> a
+    71:72:boolean delegatesToLambdaImplMethod():182:183 -> a
+    73:89:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):193:209 -> a
+    90:134:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):206:250 -> a
+    135:138:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):265:268 -> a
+    135:138:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):277 -> a
+    139:163:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):278:302 -> a
+    164:174:boolean isEnforcedSignatureValid(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexProto):415:425 -> a
+    164:174:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):302 -> a
+    175:208:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):310:343 -> a
+    209:239:void extractAltMetafactory(com.android.tools.r8.graph.DexItemFactory,java.util.List,java.util.function.Consumer,java.util.function.Consumer):356:386 -> a
+    209:239:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):335 -> a
+    240:241:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):304:305 -> a
+    242:243:void lambda$infer$0(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):339:340 -> a
+    244:248:java.util.List getInterfaces(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy):393:397 -> a
+    249:255:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):402:408 -> a
+    256:256:java.lang.Object getBootstrapArgument(java.util.List,int,java.lang.Class):403:403 -> a
+    257:265:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:445 -> a
+    266:269:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):444:447 -> a
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():109:112 -> b
-    5:5:boolean verifyTargetFoundInClass(com.android.tools.r8.graph.DexType):175:175 -> b
-    1:1:com.android.tools.r8.graph.DexMethod getMainMethod():65:65 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.t.c.K:
+    5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):259:260 -> b
+    1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> c
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.s.c.K:
     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>
@@ -32990,7 +33315,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):594:594 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):596:596 -> 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
@@ -32998,28 +33323,28 @@
     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():545:545 -> 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():401:401 -> a
-    64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():546 -> 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:72:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():555:562 -> a
-    65:72: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
-    73:79:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():559:565 -> a
-    73:79: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
-    80:80: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
-    81:86:int prepareReturnValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):261:266 -> a
-    87:104:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
-    105:105:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
-    105:105:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):594:594 -> a
-    106:106:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
-    106:106:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    107:148:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
-    149:149:void lambda$addPrimitiveWideningConversion$7(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):372:372 -> a
-    150:150: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
-    151:151:int castToBoxedType(int,com.android.tools.r8.graph.DexType):473:473 -> a
-    152:152: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
+    63:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():542:544 -> a
+    63: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:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():544 -> 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:71:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():546:546 -> a
+    67:71: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
+    77:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():552:552 -> a
+    77: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:78: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
+    79:84:int prepareReturnValue(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):261:266 -> a
+    85:102:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
+    103:103:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
+    103:103:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):596:596 -> a
+    104:104:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
+    104:104:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
+    105:146:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
+    147:147:void lambda$addPrimitiveWideningConversion$7(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):372:372 -> a
+    148:148: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
+    149:149:int castToBoxedType(int,com.android.tools.r8.graph.DexType):473:473 -> a
+    150:150: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$adjustType$6(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.conversion.IRBuilder):345:345 -> b
     2:2:void lambda$addPrimitiveWideningConversion$8(com.android.tools.r8.ir.code.NumericType,int,int,com.android.tools.r8.ir.conversion.IRBuilder):387:387 -> b
     3:3: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
@@ -33058,7 +33383,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.t.c.L:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSynthesizedCode -> com.android.tools.r8.s.c.L:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod mainMethod -> e
     1:1:void <clinit>():15:15 -> <clinit>
@@ -33070,130 +33395,82 @@
     34:34:void lambda$getRegistryCallback$1(com.android.tools.r8.graph.UseRegistry):50:50 -> b
     1:1:java.util.function.Consumer getRegistryCallback():31:31 -> getRegistryCallback
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():26:26 -> getSourceCodeProvider
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.t.c.M:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.s.c.M:
     com.android.tools.r8.graph.DexString instanceFieldName -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map knownCallSites -> d
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> c
     boolean $assertionsDisabled -> f
     java.util.Map knownLambdaClasses -> e
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView):66:88 -> <init>
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy getAppInfo():96:96 -> a
-    2:13:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):140:151 -> a
-    14:20:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):222:228 -> a
-    14:20:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
-    21:27:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):299:305 -> a
-    21:27:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):225 -> a
-    21:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
-    28:28:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):225:225 -> a
-    28:28:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
-    29:29:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:152 -> a
-    30:30:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    30:30:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):159 -> a
-    31:31:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):159:159 -> a
-    32:33:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):271:272 -> a
-    32:33:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160 -> a
-    34:35:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):161:162 -> a
-    36:47:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):318:329 -> a
-    36:47:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    48:48:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    48:48:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):329 -> a
-    48:48:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    49:49:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):329:329 -> a
-    49:49:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    50:50:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    50:50:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):328 -> a
-    50:50:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    51:78:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):331:358 -> a
-    51:78:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    79:161:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():0:82 -> a
-    79:161:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):358 -> a
-    79:161:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    162:170:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):357:365 -> a
-    162:170:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    171:171: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
-    171:171:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):365 -> a
-    171:171:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    172:186:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):367:381 -> a
-    172:186:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    187:187:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    187:187:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):382 -> a
-    187:187:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    188:188:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):382:382 -> a
-    188:188:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):167 -> a
-    189:189:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):306:306 -> a
-    189:189:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexType):225 -> a
-    189:189:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
-    190:191:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):171:172 -> a
-    192:192:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    192:192:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):172 -> a
-    193:193:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    193:193:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):172 -> a
-    194:196:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):172:174 -> a
-    197:197:void removeLambdaDeserializationMethods(java.lang.Iterable):179:179 -> a
-    198:198:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    198:198:com.android.tools.r8.graph.DexItemFactory getFactory():100 -> a
-    198:198:void removeLambdaDeserializationMethods(java.lang.Iterable):180 -> a
-    199:199:com.android.tools.r8.graph.DexItemFactory getFactory():100:100 -> a
-    199:199:void removeLambdaDeserializationMethods(java.lang.Iterable):180 -> a
-    200:200:void removeLambdaDeserializationMethods(java.lang.Iterable):180:180 -> a
-    201:202:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):188:189 -> a
-    203:213:void synthesizeAccessibilityBridgesForLambdaClassesD8(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):120:130 -> a
-    203:213:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):188 -> a
-    214:219:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):190:195 -> a
-    220:224:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):200:200 -> a
-    225:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):238:242 -> a
-    230:236:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):299:305 -> a
-    230:236:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243 -> a
-    237:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243:243 -> a
-    238:238:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):247 -> a
-    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):247:247 -> a
-    240:240:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):247 -> a
-    241:241:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    241:241:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):249 -> a
-    242:242:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):249:249 -> a
-    243:243:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    243:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):252 -> a
-    244:247:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):253:256 -> a
-    248:253:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:281 -> a
-    248:253:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    254:254:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    254:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):282 -> a
-    254:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):282:282 -> a
-    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    256:256:com.android.tools.r8.graph.DexItemFactory getFactory():100:100 -> a
-    256:256:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):286 -> a
-    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    257:260:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):286:289 -> a
-    257:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    261:261:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):288:288 -> a
-    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    262:262:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):287:287 -> a
-    262:262:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    263:263:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):284:284 -> a
-    263:263:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):259 -> a
-    264:264:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):306:306 -> a
-    264:264:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):243 -> a
-    265:265:com.android.tools.r8.graph.AppView getAppView():92:92 -> a
-    265:265:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):263 -> a
-    266:266:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    266:266:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):263 -> a
-    267:267:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):263:263 -> a
-    268:268:boolean isInMainDexList(com.android.tools.r8.graph.DexType):232:232 -> a
-    268:268:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):264 -> a
-    269:269:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):265:265 -> a
-    270:272:java.lang.Object getKnown(java.util.Map,java.lang.Object):293:295 -> a
-    1:1:com.android.tools.r8.graph.AppView getAppView():92:92 -> b
-    1:1:com.android.tools.r8.graph.AppView getAppView():92:92 -> c
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():100 -> c
-    2:2:com.android.tools.r8.graph.DexItemFactory getFactory():100:100 -> c
-    1:1:java.util.Map getKnownLambdaClasses():386:386 -> d
-com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.t.c.N:
+    1:1:void <clinit>():50:50 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):75:75 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.AppView):62:77 -> <init>
+    1:11:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):103:113 -> a
+    12:18:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):178:184 -> a
+    12:18:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):113 -> a
+    19:25:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):256:262 -> a
+    19:25:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    19:25:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):113 -> a
+    26:26:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):181:181 -> a
+    26:26:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):113 -> a
+    27:34:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):114:121 -> a
+    35:36:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):228:229 -> a
+    35:36:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):122 -> a
+    37:38:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):123:124 -> a
+    39:50:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):275:286 -> a
+    39:50:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    51:51:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    51:51:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):285 -> a
+    51:51:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    52:79:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):288:315 -> a
+    52:79:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    80:162:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asDefinitelyNotNull():0:82 -> a
+    80:162:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):315 -> a
+    80:162:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    163:171:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):314:322 -> a
+    163:171:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    172:172: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):35:35 -> a
+    172:172:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):322 -> a
+    172:172:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    173:188:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):324:339 -> a
+    173:188:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):129 -> a
+    189:189:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):263:263 -> a
+    189:189:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    189:189:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):113 -> a
+    190:191:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):133:134 -> a
+    192:192:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    192:192:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):134 -> a
+    193:195:void desugarLambdas(com.android.tools.r8.ir.code.IRCode):134:136 -> a
+    196:197:void removeLambdaDeserializationMethods(java.lang.Iterable):141:142 -> a
+    198:199:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):150:151 -> a
+    200:210:void synthesizeAccessibilityBridgesForLambdaClassesD8(java.util.Collection,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):83:93 -> a
+    200:210:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):150 -> a
+    211:216:void finalizeLambdaDesugaringForD8(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):152:157 -> a
+    217:221:void optimizeSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):162:162 -> a
+    222:226:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):195:199 -> a
+    227:233:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):256:262 -> a
+    227:233:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):200 -> a
+    234:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):200:204 -> a
+    239:239:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):204 -> a
+    240:248:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):205:213 -> a
+    249:261:void addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):234:246 -> a
+    249:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):216 -> a
+    262:262:void addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):245:245 -> a
+    262:262:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):216 -> a
+    263:263:void addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):244:244 -> a
+    263:263:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):216 -> a
+    264:264:void addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):240:240 -> a
+    264:264:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):216 -> a
+    265:265:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):263:263 -> a
+    265:265:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):200 -> a
+    266:267:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):220:221 -> a
+    268:268:boolean isInMainDexList(com.android.tools.r8.graph.DexType):188:188 -> a
+    268:268:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):221 -> a
+    269:269:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):222:222 -> a
+    270:272:java.lang.Object getKnown(java.util.Map,java.lang.Object):250:252 -> a
+    273:273:java.util.Map getKnownLambdaClasses():343:343 -> a
+com.android.tools.r8.ir.desugar.LambdaSynthesizedCode -> com.android.tools.r8.s.c.N:
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():14:14 -> <clinit>
@@ -33201,7 +33478,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.t.c.O:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.s.c.O:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -33215,7 +33492,7 @@
     void reportIncompleteNest(java.util.List) -> a
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84 -> a
     3:17:com.android.tools.r8.utils.Pair extractNest(com.android.tools.r8.graph.DexClass):99:113 -> a
     18:18:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):117:117 -> a
@@ -33250,12 +33527,12 @@
     102:103:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):307:308 -> a
     104:105:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):250:251 -> a
     104:105:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    106:106:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    106:106:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     106:106:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):253 -> a
     106:106:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     107:110:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):253:256 -> a
     107:110:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    111:111:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    111:111:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     111:111:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):258 -> a
     111:111:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     112:117:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):259:264 -> a
@@ -33263,14 +33540,14 @@
     118:118:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):218:218 -> a
     118:118:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     118:118:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    119:119:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    119:119:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     119:119:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):220 -> a
     119:119:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     119:119:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     120:122:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):221:223 -> a
     120:122:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     120:122:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    123:123:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    123:123:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     123:123:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):224 -> a
     123:123:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     123:123:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
@@ -33288,17 +33565,17 @@
     13:18:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):328:333 -> b
     19:20:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):244:245 -> b
     19:20:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
-    21:1908: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):0:1887 -> b
-    21:1908:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):245 -> b
-    21:1908:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
-    1909:1912: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):1886:1889 -> b
-    1909:1912:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):245 -> b
-    1909:1912:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
-    1913:1913:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):246:246 -> b
-    1913:1913:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
-    1914:1922:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):335:343 -> b
+    21:1914: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):0:1893 -> b
+    21:1914:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):245 -> b
+    21:1914:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
+    1915:1918: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):1892:1895 -> b
+    1915:1918:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):245 -> b
+    1915:1918:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
+    1919:1919:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):246:246 -> b
+    1919:1919:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
+    1920:1928:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):335:343 -> b
     void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> c
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.t.c.O$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.s.c.O$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):460:462 -> <init>
@@ -33317,7 +33594,7 @@
     2:2:boolean isGet():483:483 -> g
     2:2:boolean isStaticGet():499 -> g
     1:1:int hashCode():467:467 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.t.c.P:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.s.c.P:
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> b
     com.android.tools.r8.graph.DexClassAndMethod context -> a
     1:3:void <init>(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexClassAndMethod):357:359 -> <init>
@@ -33325,7 +33602,7 @@
     5:6: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.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):89:90 -> a
     5:6: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.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):44 -> a
     5:6:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):368 -> a
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
     7: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.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):89 -> a
     7: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.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):44 -> a
     7:7:boolean registerInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):368 -> a
@@ -33334,7 +33611,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):94:94 -> a
     11:11: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):44 -> a
     11:11:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):377 -> a
-    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
     12:12:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.definitionFor(com.android.tools.r8.graph.DexField):94 -> 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):44 -> a
     12:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):377 -> a
@@ -33348,7 +33625,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):395:395 -> registerInvokeVirtual
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):440:440 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):445:445 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.t.c.S:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.s.c.S:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
@@ -33364,7 +33641,7 @@
     1:6:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):100:105 -> lookupPrototypeChanges
     1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):68:69 -> lookupPutFieldForMethod
     1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):79:79 -> verifyIsContextFreeForMethod
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder -> com.android.tools.r8.t.c.Q:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense$Builder -> com.android.tools.r8.s.c.Q:
     boolean $assertionsDisabled -> h
     java.util.Map getFieldMap -> f
     java.util.Map putFieldMap -> g
@@ -33373,7 +33650,7 @@
     1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):138:138 -> a
     2:8:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146:152 -> a
     1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):142:142 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.t.c.T:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.s.c.T:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
@@ -33382,7 +33659,7 @@
     3:7:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
     boolean isRewriting() -> b
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.t.c.T$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.s.c.T$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -33421,7 +33698,7 @@
     19:23:void failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126:130 -> b
     19:23:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):162 -> b
     19:23:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     24:24:void failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131 -> b
     24:24:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):162 -> b
     24:24:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
@@ -33430,20 +33707,20 @@
     25:29:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
     30:30:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):165:165 -> b
     30:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.t.c.U:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.s.c.U:
     1:1:void <init>():189:189 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     boolean isRewriting() -> b
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.t.c.V:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.s.c.V:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1180 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1214 -> a
     2:2:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39 -> a
     3:5:com.android.tools.r8.ir.desugar.NestedPrivateMethodLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):39:39 -> a
     6:22:void computeAndProcessNestsConcurrently(java.util.concurrent.ExecutorService):77:93 -> a
@@ -33458,7 +33735,7 @@
     33:38:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:63 -> a
     39:42:void reportIncompleteNest(java.util.List):113:116 -> a
     1:4:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):104:107 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.t.c.b0:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.s.c.b0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -33523,8 +33800,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):457 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.t.c.W:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.t.c.a0:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.s.c.W:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.s.c.a0:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -33550,7 +33827,7 @@
     14:15:void appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
     14:15:void desugar():345 -> a
     16:17:void desugar():348:349 -> a
-    18:18: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
+    18:18: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):35:35 -> a
     18:18:void desugar():349 -> a
     19:20:void appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
     19:20:void desugar():348 -> a
@@ -33563,16 +33840,16 @@
     36:38:void desugar():369:369 -> a
     41:68:void desugar():372:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):284:284 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.t.c.X:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.s.c.X:
     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.t.c.Y:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.s.c.Y:
     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.t.c.Z:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.s.c.Z:
     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>
@@ -33580,7 +33857,7 @@
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
     2:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443 -> a
     3:8:com.android.tools.r8.ir.code.Value getOrCreateValue():444:444 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.t.c.c0:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.s.c.c0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -33595,7 +33872,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.t.c.d0:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.s.c.d0:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -33662,7 +33939,7 @@
     567:609: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):628:670 -> a
     567:609:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132 -> a
     610:613:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):134:137 -> a
-    614:614:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
+    614:614:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
     614:614:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):137 -> a
     615:643:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140:168 -> a
     644:644:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):165:165 -> a
@@ -33672,7 +33949,7 @@
     663:663:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     663:663:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):98 -> a
     664:664:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):102:102 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.t.c.e0.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.s.c.e0.a:
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1787:1806 -> A
     21:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1803:1818 -> A
     37:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1831 -> A
@@ -34151,7 +34428,7 @@
     46:60:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5062:5076 -> z0
     61:61:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5073:5073 -> z0
     62:105:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5039:5082 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.t.c.e0.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.s.c.e0.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <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,java.util.Set):24:28 -> a
@@ -34160,67 +34437,68 @@
     6:6:void rewriteLogicalOr(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.util.Set):39:39 -> 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,java.util.Set):48:52 -> 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,java.util.Set):51:51 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.t.c.e0.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.s.c.e0.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.t.c.e0.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.s.c.e0.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <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,java.util.Set):25:25 -> 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):46:52 -> 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,java.util.Set):41:41 -> 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,java.util.Set):33:33 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.t.c.e0.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.s.c.e0.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:1: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
     2:5: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
-    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    7:10:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
-    11:12:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
-    13:13: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
-    14:74:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:60 -> a
-    14:74: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):16 -> a
-    75:80:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):77:82 -> a
-    75:80:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):61 -> a
-    75:80: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):16 -> a
-    81:81:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):62:62 -> a
-    81:81: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):16 -> a
-    82:82:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):59:59 -> a
+    6:6:boolean com.android.tools.r8.utils.ObjectUtils.getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):13:13 -> a
+    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    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:14: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
+    15:75:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:60 -> a
+    15:75: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):16 -> a
+    76:81:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite.writeTo(java.io.OutputStream):77:82 -> a
+    76:81:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):61 -> a
+    76:81: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):16 -> a
+    82:82:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):62:62 -> a
     82:82: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):16 -> a
-    83:88: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):17:22 -> a
-    89:96: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
-    97:97: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
-    98:98: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
-    99:99:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
-    100:104:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-    105:105:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
-    106:107:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    108:116: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
-    117:117:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    118:118:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
-    119:119:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    120:123: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,java.util.Set):34:37 -> a
-    124:126:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    127:127:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):41:41 -> a
-    128:129: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
-    130:132: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
-    133:133:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    134:134:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    135:135:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    136:143:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    144:151:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    152:152:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
-    153:163:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    170:170:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
-    171:174:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    177:177:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
-    178:184:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
-    192:192:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
-    193:195: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
-    196:196:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt.addTo(java.lang.Object,java.util.Collection):971:971 -> a
+    83:83:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):59:59 -> a
+    83:83: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):16 -> a
+    84:89: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):17:22 -> a
+    90:97: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
+    98:98: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
+    99:99: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
+    100:100:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
+    101:105:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
+    106:106:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
+    107:108:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
+    109:117: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
+    118:118:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
+    119:119:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    120:120:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    121:124: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,java.util.Set):34:37 -> a
+    125:127:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    128:128:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):41:41 -> a
+    129:130: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
+    131:133: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
+    134:134:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    135:135:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    136:136:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    137:144:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    145:152:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    153:153:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):62:62 -> a
+    154:164:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    171:171:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):68:68 -> a
+    172:175:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    178:178:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):64:64 -> a
+    179:185:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:61 -> a
+    193:193:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):69:69 -> a
+    194:196: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
+    197:197: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,java.util.Set):23:26 -> b
@@ -34230,12 +34508,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,java.util.Set):23:26 -> e
     1:8: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,java.util.Set):37:44 -> 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,java.util.Set):24:29 -> g
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.t.c.e0.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.s.c.e0.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <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,java.util.Set):26:29 -> 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,java.util.Set):28:28 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.t.c.e0.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.s.c.e0.g:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:7:void rewriteAsIdentity(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.util.Set):43:49 -> a
@@ -34271,7 +34549,7 @@
     96:96:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     97:106:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:323 -> a
     97:106:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     107:107:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):323 -> a
     107:107:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     108:113:void runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):327:332 -> a
@@ -34364,22 +34642,220 @@
     java.util.Set assumeDynamicTypeInstructionsToRemove -> d
     boolean mayHaveIntroducedTrivialPhi -> e
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:44 -> <init>
-    1:3:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):56:58 -> a
-    4:4:void markForRemoval(com.android.tools.r8.ir.code.Assume):52:52 -> a
-    4:4:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):58 -> a
-    5:19:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):66:80 -> a
-    20:29:com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover removeMarkedInstructions(java.util.Set):85:94 -> a
-    30:31:void finish():103:104 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:40 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:42 -> <init>
+    1:3:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):54:56 -> a
+    4:4:void markForRemoval(com.android.tools.r8.ir.code.Assume):50:50 -> a
+    4:4:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):56 -> a
+    5:19:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):63:77 -> a
+    20:29:com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover removeMarkedInstructions(java.util.Set):82:91 -> a
+    30:31:void finish():100:101 -> a
     32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    32:32:void finish():104 -> a
-    33:33:void finish():104:104 -> a
-    1:1:boolean mayHaveIntroducedTrivialPhi():48:48 -> b
-com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.e:
-    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.f:
+    32:32:void finish():101 -> a
+    33:33:void finish():101:101 -> a
+    1:1:boolean mayHaveIntroducedTrivialPhi():46:46 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.ir.optimize.e:
+    com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():51:51 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):55:56 -> <init>
+    boolean lambda$computeDominanceForAssumedValues$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    boolean lambda$computeDominanceForAssumedValues$4(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):61:61 -> a
+    2:2:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):70:70 -> a
+    3:3:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):80:80 -> a
+    3:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    4:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues computeAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate):113:120 -> a
+    4:11:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):81 -> a
+    4:11:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    12:12:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):82:82 -> a
+    12:12:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    13:13:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():561:561 -> a
+    13:13:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):83 -> a
+    13:13:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    14:21:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):87:94 -> a
+    14:21:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    22:22:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():561:561 -> a
+    22:22:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):95 -> a
+    22:22:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    23:23:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):99:99 -> a
+    23:23:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    24:24:void removeRedundantDominatedAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Map):349:349 -> a
+    24:24:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):100 -> a
+    24:24:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    25:25:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):101:101 -> a
+    25:25:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    26:26:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():561:561 -> a
+    26:26:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):102 -> a
+    26:26:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    27:29:void internalInsertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):106:108 -> a
+    27:29:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):71 -> a
+    30:30:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):72:72 -> a
+    31:81:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):133:183 -> a
+    82:82:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():27:27 -> a
+    82:82:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):184 -> a
+    83:93:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):184:194 -> a
+    94:94:boolean com.android.tools.r8.ir.code.If.isNullTest():93:93 -> a
+    94:94:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97 -> a
+    94:94:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):195 -> a
+    95:95:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():97:97 -> a
+    95:95:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):195 -> a
+    96:100:void computeAssumedValuesInBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):196:200 -> a
+    101:127:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):207:233 -> a
+    128:128:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):243:243 -> a
+    129:144:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.removeIf(java.util.function.BiPredicate):586:601 -> a
+    129:144:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):243 -> a
+    145:148:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):245:248 -> a
+    149:150:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.contains(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):556:557 -> a
+    149:150:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):249 -> a
+    151:154:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):255:258 -> a
+    155:156:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):260:261 -> a
+    157:157:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():695:695 -> a
+    157:157:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():686 -> a
+    157:157:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):263 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):267:267 -> a
+    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():674:674 -> a
+    159:159:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):268 -> a
+    160:176:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):275:291 -> a
+    177:177:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():678:678 -> a
+    177:177:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):297 -> a
+    178:182:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):302:306 -> a
+    183:192:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):304:313 -> a
+    193:193:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.builder(com.android.tools.r8.ir.code.Value):670:670 -> a
+    193:193:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):316 -> a
+    194:212:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):317:335 -> a
+    213:218: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):436:441 -> a
+    213:218:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):337 -> a
+    219:219:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    219:219: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):441 -> a
+    219:219:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):337 -> a
+    220:228: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):443:451 -> a
+    220:228:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):337 -> a
+    229:233:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):338:342 -> a
+    234:234:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):314:314 -> a
+    235:236:void lambda$materializeAssumeInstructions$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):358:359 -> a
+    237:237:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():493:493 -> a
+    237:237:void lambda$materializeAssumeInstructions$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):361 -> a
+    238:239:void lambda$materializeAssumeInstructions$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):364:365 -> a
+    240:267:void lambda$materializeAssumeInstructions$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):363:390 -> a
+    268:284:void lambda$materializeAssumeInstructions$11(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):387:403 -> a
+    285:291:void lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):377:383 -> a
+    292:292:java.util.Map lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.BasicBlock):401:401 -> a
+    293:299:void lambda$materializeAssumeInstructions$12(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):408:414 -> a
+    300:305:com.android.tools.r8.ir.code.BasicBlock getInsertionBlock(com.android.tools.r8.ir.code.Instruction):424:429 -> a
+    306:307:boolean isNullableReferenceType(com.android.tools.r8.ir.code.Value):460:461 -> a
+    306:307:boolean isNullableReferenceTypeWithNonDebugUsers(com.android.tools.r8.ir.code.Value):465 -> a
+    308:308:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():539:539 -> a
+    308:308:boolean isNullableReferenceTypeWithNonDebugUsers(com.android.tools.r8.ir.code.Value):465 -> a
+    309:310:boolean isNullableReferenceType(com.android.tools.r8.ir.code.Value):460:461 -> a
+    309:310:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):470 -> a
+    311:314:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):471:474 -> a
+    boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
+    1:1:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):281:281 -> b
+    2:2:java.util.Set lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):331:331 -> b
+    3:69:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):353:419 -> b
+    70:70:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    70:70:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):419 -> b
+    71:71:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):419:419 -> b
+    1:1:java.util.List lambda$materializeAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction):402:402 -> c
+com.android.tools.r8.ir.optimize.AssumeInserter$1 -> com.android.tools.r8.ir.optimize.e$a:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.ir.optimize.e$b:
+    1:1:void <init>():643:643 -> <init>
+    com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
+    boolean isEverything() -> b
+    boolean isEverythingElse() -> c
+    boolean isNothing() -> d
+    boolean isSomething() -> e
+    boolean isUnknown() -> f
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.ir.optimize.e$b$a:
+    java.util.Map dominatedPhiUsers -> c
+    com.android.tools.r8.ir.code.Value assumedValue -> a
+    java.util.Set dominatedUsers -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():698:698 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$1):698:698 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Value):705:705 -> <init>
+    3:7:void <init>(com.android.tools.r8.ir.code.Value):702:706 -> <init>
+    1:3:void addDominatedUser(com.android.tools.r8.ir.code.Instruction):710:712 -> a
+    4:6:void addDominatedPhiUser(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):716:718 -> a
+    7:7:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():722:722 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.nothing():682:682 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():723 -> a
+    9:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():725:725 -> a
+    13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():727:727 -> a
+    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.something(java.util.Set,java.util.Map):691:691 -> a
+    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():727 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.ir.optimize.e$c:
+    com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance dominance -> a
+    1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):488:489 -> <init>
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.ir.optimize.e$d:
+    java.util.Map assumedValues -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():505:505 -> <clinit>
+    1:2:void <init>(java.util.Map):514:515 -> <init>
+    1:22:void computeDominance(java.util.function.BiFunction):523:544 -> a
+    23:23:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDominance(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):497:497 -> a
+    23:23:void computeDominance(java.util.function.BiFunction):546 -> a
+    24:25:void computeDominance(java.util.function.BiFunction):549:550 -> a
+    26:26:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):538:538 -> a
+    27:27:void forEach(com.android.tools.r8.utils.TriConsumer):565:565 -> a
+    28:28:void lambda$forEach$2(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.ir.code.Instruction,java.util.Map):567:567 -> a
+    29:29:void lambda$forEach$1(com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):569:569 -> a
+    30:30:void removeAll(java.util.Map):573:573 -> a
+    31:35:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Set):575:579 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.ir.optimize.e$d$a:
+    java.util.Map assumedValues -> a
+    java.util.Set assumedValuesKnownToDominateAllUsers -> b
+    1:7:void <init>():606:612 -> <init>
+    1:3:void addNonNullValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):616:618 -> a
+    4:505:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():0:501 -> a
+    4:505:void addNonNullValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):619 -> a
+    506:507:void addNonNullValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):620:621 -> a
+    508:508:java.util.Map lambda$addNonNullValue$0(com.android.tools.r8.ir.code.Instruction):617:617 -> a
+    509:509:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo lambda$addNonNullValue$1(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance,com.android.tools.r8.ir.code.Value):618:618 -> a
+    510:510:boolean isMaybeNull(com.android.tools.r8.ir.code.Value):634:634 -> a
+    511:511:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues build():638:638 -> a
+    512:512:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():674:674 -> a
+    512:512:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):626 -> a
+    513:513:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):626:626 -> a
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():695:695 -> b
+    1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):630 -> b
+    2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):630:630 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.ir.optimize.e$e:
+    com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
+    1:1:void <clinit>():734:734 -> <clinit>
+    1:1:void <init>():736:736 -> <init>
+    boolean isEverything() -> b
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():739:739 -> g
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.ir.optimize.e$f:
+    com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
+    1:1:void <clinit>():750:750 -> <clinit>
+    1:1:void <init>():753:753 -> <init>
+    boolean isEverythingElse() -> c
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():756:756 -> g
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.ir.optimize.e$g:
+    com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
+    1:1:void <clinit>():767:767 -> <clinit>
+    1:1:void <init>():769:769 -> <init>
+    boolean isNothing() -> d
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():772:772 -> g
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.ir.optimize.e$h:
+    java.util.Map dominatedPhiUsers -> b
+    java.util.Set dominatedUsers -> a
+    1:3:void <init>(java.util.Set,java.util.Map):787:789 -> <init>
+    com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
+    boolean isSomething() -> e
+    1:1:java.util.Map getDominatedPhiUsers():797:797 -> g
+    1:1:java.util.Set getDominatedUsers():793:793 -> h
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.ir.optimize.e$i:
+    com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
+    1:1:void <clinit>():813:813 -> <clinit>
+    1:1:void <init>():815:815 -> <init>
+    boolean isUnknown() -> f
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():818:818 -> g
+com.android.tools.r8.ir.optimize.Assumer -> com.android.tools.r8.ir.optimize.f:
+    void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing) -> a
+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
@@ -34398,60 +34874,72 @@
     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.g:
+com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator -> com.android.tools.r8.ir.optimize.i:
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> d
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.utils.collections.ProgramMethodSet revisitedMethods -> b
-    boolean $assertionsDisabled -> d
-    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
-    1:1:void <clinit>():42:42 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):57:64 -> <init>
-    1:29:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):85:113 -> a
-    30:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):111:114 -> a
-    34:35:boolean hasLibraryOverrides(java.util.Collection):151:152 -> a
-    34:35:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):114 -> a
-    36:37:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):117:118 -> a
-    38:42:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):176:180 -> a
-    38:42:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    43:55:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):190:202 -> a
-    43:55:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):184 -> a
-    43:55:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    56:66:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):200:210 -> a
-    56:66:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):184 -> a
-    56:66:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    67:78:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):208:219 -> a
-    67:78:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):184 -> a
-    67:78:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    79:79:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):191:191 -> a
-    79:79:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):184 -> a
-    79:79:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    80:80:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):184:184 -> a
-    80:80:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    81:81:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,java.util.List):183:183 -> a
-    81:81:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118 -> a
-    82:86:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:125 -> a
-    87:347:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexItemFactory):0:260 -> a
-    87:347:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):124 -> a
-    348:354:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):130:136 -> a
-    355:363:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):134:142 -> a
-    364:369:boolean isLibraryMethodOrLibraryMethodOverride(com.android.tools.r8.graph.DexEncodedMethod):161:166 -> a
-    370:422:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):226:278 -> a
-    423:423:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    423:423:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):278 -> a
-    424:439:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):279:294 -> a
-    440:440:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    440:440:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):294 -> a
-    441:467:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):295:321 -> a
-    468:468:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    468:468:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):321 -> a
-    469:469:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):321:321 -> a
-    470:494:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():327:351 -> a
-    495:497:void lambda$methodsToRevisit$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):344:346 -> a
+    com.android.tools.r8.utils.collections.ProgramMethodSet revisitedMethods -> c
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions options -> b
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):67:67 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.AppView):64:72 -> <init>
+    1:8:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):93:100 -> a
+    9:23:void collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):109:123 -> a
+    9:23:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):99 -> a
+    24:24:boolean isMaybeClasspathOrLibraryMethodOverride(com.android.tools.r8.graph.ProgramMethod):147:147 -> a
+    24:24:void collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):124 -> a
+    24:24:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):99 -> a
+    25:25:void collectCallSiteOptimizationInfoForInvokeMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):127:127 -> a
+    25:25:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):99 -> a
+    26:27:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):101:102 -> a
+    28:35:void collectCallSiteOptimizationInfoForInvokeCustom(com.android.tools.r8.ir.code.InvokeCustom):133:140 -> a
+    28:35:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):102 -> a
+    36:51:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):156:171 -> a
+    52:55:boolean verifyAllProgramDispatchTargetsHaveBeenAbandoned(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):440:443 -> a
+    52:55:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):171 -> a
+    56:63:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):175:182 -> a
+    64:84:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):179:199 -> a
+    85:99:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):218:232 -> a
+    85:99:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):201 -> a
+    100:177:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):0:77 -> a
+    100:177:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):232 -> a
+    100:177:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):201 -> a
+    178:178:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):234:234 -> a
+    178:178:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):201 -> a
+    179:185:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo propagateArgumentsToDispatchTarget(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.utils.Timing):231:237 -> a
+    179:185:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):201 -> a
+    186:191:void propagateArgumentsToDispatchTargets(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):205:210 -> a
+    192:222:void abandonCallSitePropagation(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):245:275 -> a
+    223:234:void lambda$abandonCallSitePropagation$2(com.android.tools.r8.graph.LookupResult,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Consumer):261:261 -> a
+    235:240:void lambda$abandonCallSitePropagation$1(java.util.function.Consumer,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):263:268 -> a
+    241:241:void abandonCallSitePropagation(com.android.tools.r8.utils.ForEachable):279:279 -> a
+    242:242:void lambda$abandonCallSitePropagation$3(com.android.tools.r8.graph.ProgramMethod):279:279 -> a
+    243:246:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):284:287 -> a
+    243:246:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):198 -> a
+    247:255:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):286:294 -> a
+    247:255:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):198 -> a
+    256:308:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):302:354 -> a
+    309:309:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    309:309:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):354 -> a
+    310:325:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):355:370 -> a
+    326:326:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    326:326:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):370 -> a
+    327:353:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):371:397 -> a
+    354:354:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    354:354:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):397 -> a
+    355:355:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):397:397 -> a
+    356:380:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():403:427 -> a
+    381:390:boolean lambda$methodsToRevisit$4(com.android.tools.r8.graph.DexEncodedMethod):408:417 -> a
+    391:393:void lambda$methodsToRevisit$5(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):420:422 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-    1:10:boolean lambda$methodsToRevisit$0(com.android.tools.r8.graph.DexEncodedMethod):332:341 -> b
-    1:9:void logResults():69:77 -> c
-    10:10:void logResults():73:73 -> c
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.h:
+    1:9:void logResults():77:85 -> c
+    10:10:void logResults():81:81 -> c
+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>():56:58 -> <clinit>
+    1:1:void <init>(java.lang.String,int):55:55 -> <init>
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.j:
     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
@@ -34460,635 +34948,653 @@
     1:1:void <clinit>():63:63 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):120:120 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):118:123 -> <init>
-    1:9:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):128:136 -> a
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    10:10:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):136 -> a
-    11:36:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):138:163 -> a
-    37:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):290:314 -> a
-    37:61:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):318:318 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    62:62:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    63:63:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):318 -> a
-    63:63:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    63:63:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    64:98:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):320:354 -> a
-    64:98:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    64:98:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    99:99:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
-    99:99:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):354 -> a
-    99:99:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    99:99:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    100:102:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):354:356 -> a
-    100:102:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    100:102:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    103:103:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163:163 -> a
-    104:104:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):356:356 -> a
-    104:104:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):314 -> a
-    104:104:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):163 -> a
-    105:113:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):164:172 -> a
-    114:114:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():76:76 -> a
-    114:114:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):173 -> a
-    115:131:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):173:189 -> a
-    132:164:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):165:197 -> a
-    165:165:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    165:165:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):201 -> a
-    166:192:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):202:228 -> a
-    193:193:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    193:193:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229 -> a
-    194:194:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229:229 -> a
-    195:195:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):96:96 -> a
-    195:195:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229 -> a
-    196:247:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):235:286 -> a
-    248:248:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):129:129 -> a
-    249:249:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):247:247 -> a
-    250:250:void lambda$optimize$1(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):264:264 -> a
-    251:252:void lambda$optimize$2():272:273 -> a
-    253:253:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):362:362 -> a
-    254:254:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    254:254:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):364 -> a
-    255:255:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    255:255:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
-    256:377:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:487 -> a
-    378:485:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):380:487 -> a
-    486:584:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):389:487 -> a
-    585:587:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):396:398 -> a
-    588:589:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):276:277 -> a
-    588:589:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
-    590:590:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):400:400 -> a
-    591:595:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():879:883 -> a
-    591:595:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):405 -> a
-    596:614:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408:426 -> a
-    615:622:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):521:528 -> a
-    615:622:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):433 -> a
-    623:675:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):435:487 -> a
-    676:706:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):457:487 -> a
-    707:731:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):463:487 -> a
-    732:739:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):482:489 -> a
-    740:740:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):487:487 -> a
-    741:741:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$3(com.android.tools.r8.graph.DexField):451:451 -> a
-    742:743:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):514:515 -> a
-    744:752:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):532:540 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.ir.optimize.h$a:
+    1:71:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):127:197 -> a
+    72:72:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
+    72:72:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):201 -> a
+    73:99:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):202:228 -> a
+    100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
+    100:100:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229 -> a
+    101:101:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229:229 -> a
+    102:102:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):96:96 -> a
+    102:102:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):229 -> a
+    103:156:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):235:288 -> a
+    157:161:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):159:163 -> a
+    162:186:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):292:316 -> a
+    162:186:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    187:187:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):320:320 -> a
+    187:187:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    187:187:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    188:188:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):320 -> a
+    188:188:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    188:188:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    189:223:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:356 -> a
+    189:223:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    189:223:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    224:224:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping.map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
+    224:224:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):356 -> a
+    224:224:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    224:224:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    225:227:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):356:358 -> a
+    225:227:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    225:227:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    228:228:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163:163 -> a
+    229:229:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):358:358 -> a
+    229:229:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):316 -> a
+    229:229:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):163 -> a
+    230:238:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):164:172 -> a
+    239:239:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():78:78 -> a
+    239:239:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):173 -> a
+    240:256:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):173:189 -> a
+    257:260:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):165:168 -> a
+    261:261:com.android.tools.r8.graph.DexField lambda$optimize$1(com.android.tools.r8.graph.DexEncodedField):248:248 -> a
+    262:262:void lambda$optimize$2(java.util.Set,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):266:266 -> a
+    263:264:void lambda$optimize$3():274:275 -> a
+    265:265:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):364:364 -> a
+    266:266:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    266:266:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):366 -> a
+    267:267:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    267:267:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):367 -> a
+    268:278:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):368:378 -> a
+    279:279:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> a
+    279:279:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):379 -> a
+    280:390:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):380:490 -> a
+    391:499:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):382:490 -> a
+    500:599:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):391:490 -> a
+    600:605:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):398:403 -> a
+    606:610:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():906:910 -> a
+    606:610:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):408 -> a
+    611:636:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):411:436 -> a
+    637:644:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):524:531 -> a
+    637:644:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):436 -> a
+    645:697:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):438:490 -> a
+    698:728:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):460:490 -> a
+    729:753:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):466:490 -> a
+    754:761:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):485:492 -> a
+    762:763:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):490:491 -> a
+    764:764:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):454:454 -> a
+    765:765:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):517:517 -> a
+    766:774:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):535:543 -> a
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.ir.optimize.j$a:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     1:1:void <clinit>():67:67 -> <clinit>
     1:2:void <init>(java.util.Map):72:73 -> <init>
     1:1:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult empty():77:77 -> a
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):81:82 -> a
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     4:4:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87 -> a
     5:6:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):88:89 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.i:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.k:
     java.util.Map fieldsWithStaticValues -> a
     1:1:void <init>(java.util.Map):99:99 -> <init>
     2:5:void <init>(java.util.Map):97:100 -> <init>
     1:1:void join(java.util.Map):104:104 -> a
     2:2:void execute():110:110 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.j:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.l:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():133:133 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):152:156 -> <init>
+    1:1:void <clinit>():136:136 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):155:159 -> <init>
     boolean lambda$computeConstantArrayValues$8(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):160:162 -> a
-    4:4:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):237:237 -> 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):423:446 -> a
-    29:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513:513 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1408:1408 -> a
-    30:30:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
-    31:32:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():651:652 -> a
-    31:32:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
-    33:44:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):520:531 -> a
-    45:45:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():30:30 -> a
-    45:45:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):531 -> a
-    46:53:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):532:539 -> 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):691:727 -> a
-    91:91:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):555:555 -> 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):728 -> 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):729:743 -> a
-    107:107:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):555:555 -> 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):744 -> 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):745:754 -> 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):804:817 -> 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):814:814 -> a
-    133:144:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):827:838 -> a
-    145:145:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843:843 -> a
-    146:297:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):0:151 -> a
-    146:297:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843 -> a
-    298:305:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843:850 -> a
-    306:306:int codeUnitMargin():857:857 -> a
-    307:320:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):958:971 -> a
-    321:350:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1133:1162 -> a
-    321:350:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):973 -> a
-    351:380:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):975:1004 -> a
-    381:381:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    381:381:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1004 -> a
-    382:385:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1004:1007 -> a
-    386:426:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1016:1056 -> a
-    427:427:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    427:427:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1056 -> a
-    428:442:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1057:1071 -> a
-    443:443:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    443:443:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1071 -> a
-    444:479:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1073:1108 -> a
-    480:480:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    480:480:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
-    481:481:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1110:1110 -> a
-    482:496:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):862:876 -> a
-    482:496:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    497:497:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    497:497:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):876 -> a
-    497:497:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    498:509:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):882:893 -> a
-    498:509:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    510:510:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    510:510:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):893 -> a
-    510:510:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    511:560:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):894:943 -> a
-    511:560:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    561:561:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    561:561:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):944 -> a
-    561:561:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    562:562:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):949:949 -> a
-    562:562:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
-    563:571:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1115:1123 -> a
-    572:572:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1052:1052 -> a
-    573:587:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1173:1187 -> a
-    588:606:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):466:484 -> a
-    588:606:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1188 -> a
-    607:607:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1190:1190 -> a
-    608:621:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):490:503 -> a
-    608:621:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1191 -> a
-    622:638:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1195:1211 -> a
-    639:704:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1440:1505 -> a
-    705:705:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    705:705:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1506 -> a
-    706:706:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1481:1481 -> a
-    707:709:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1513:1515 -> a
-    710:710:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    710:710:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1515 -> a
-    711:713:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1515:1517 -> a
-    714:724: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):1522:1532 -> a
-    725:733:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1653:1661 -> a
-    734:739:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1680:1685 -> a
-    740:741:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1748:1749 -> a
-    742:748:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1811:1817 -> a
-    749:848:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1845:1944 -> a
-    849:895:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:46 -> a
-    849:895:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1944 -> a
-    896:897:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1945:1946 -> a
-    898:945:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1982:2029 -> a
-    946:947: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):2558:2559 -> a
-    948:948:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2724:2724 -> a
-    949:949:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> a
-    949:949:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2724 -> a
-    950:951:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2724:2725 -> a
-    952:979:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2735:2762 -> a
-    980:980:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> a
-    980:980:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2766 -> a
-    981:995:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2781:2795 -> a
-    996:1021:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2972:2997 -> a
-    1022:1024: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):3008:3010 -> a
-    1025:1027: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
-    1025:1027: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):3010 -> a
-    1028:1029: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):3011:3012 -> a
-    1030:1050:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3133:3153 -> a
-    1051:1051: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
-    1051:1051:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3153 -> a
-    1052:1068:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3153:3169 -> a
-    1069:1069:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3168:3168 -> a
-    1070:1070:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1070:1070:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3167 -> a
-    1071:1082:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3167:3178 -> a
-    1083:1105:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3189:3211 -> a
-    1106:1106: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
-    1106:1106:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3211 -> a
-    1107:1107:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3212:3212 -> a
-    1108:1142: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):3249:3283 -> a
-    1108:1142:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3216 -> a
-    1143:1165:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3217:3239 -> a
-    1166:1166: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
-    1166:1166:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3239 -> a
-    1167:1171:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3294:3298 -> a
-    1172:1172: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
-    1172:1172:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3298 -> a
-    1173:1177:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3299:3303 -> a
-    1178:1178:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3356:3356 -> a
-    1179:1183:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3362:3366 -> a
-    1179:1183:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1184:1184:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1184:1184:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3366 -> a
-    1184:1184:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1185:1185:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3371:3371 -> a
-    1185:1185:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1186:1186:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3368:3368 -> a
-    1186:1186:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1187:1187:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1187:1187:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3368 -> a
-    1187:1187:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1188:1188:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3368:3368 -> a
-    1188:1188:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3358 -> a
-    1189:1189: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):3377:3377 -> a
-    1190:1190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1190:1190: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):3378 -> a
-    1191:1191: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):3380:3380 -> a
-    1192:1192:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    1192:1192: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):3380 -> a
-    1193:1194: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):3380:3381 -> a
-    1195:1215:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3391:3411 -> a
-    1216:1216:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1216:1216:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3410 -> a
-    1217:1223:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3413:3419 -> a
-    1224:1262:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3417:3455 -> a
-    1263:1266: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):1452:1455 -> a
-    1263:1266:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3455 -> a
-    1267:1289:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3456:3478 -> a
-    1290:1290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1290:1290:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3478 -> a
-    1291:1294:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479:3479 -> a
-    1297:1310:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3482:3495 -> a
-    1311:1318:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3499:3506 -> a
-    1319:1329:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3519:3529 -> a
-    1319:1329:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1330:1330:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3507:3507 -> a
-    1331:1356:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3552:3577 -> a
-    1331:1356:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3507 -> a
-    1357:1361:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3508:3512 -> a
-    1362:1362:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3509:3509 -> a
-    1363:1363:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1363:1363:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3509 -> a
-    1364:1364:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1364:1364:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1364:1364:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3509 -> a
-    1365:1365:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3509:3509 -> a
-    1366:1366:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3527:3527 -> a
-    1366:1366:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1367:1367:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1367:1367:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3527 -> a
-    1367:1367:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1368:1368:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1368:1368:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1368:1368:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3527 -> a
-    1368:1368:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1369:1369:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3527:3527 -> a
-    1369:1369:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1370:1370:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3523:3523 -> a
-    1370:1370:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1371:1371:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1371:1371:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3523 -> a
-    1371:1371:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1372:1372:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1372:1372:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1372:1372:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3523 -> a
-    1372:1372:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1373:1373:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3523:3523 -> a
-    1373:1373:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3506 -> a
-    1374:1380:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3533:3539 -> a
-    1:1:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> b
+    1:1:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,java.util.Collection,com.android.tools.r8.utils.Timing):164:164 -> a
+    2:7:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Collection,java.util.function.Predicate,com.android.tools.r8.utils.Timing):169:174 -> a
+    2:7:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,java.util.Collection,com.android.tools.r8.utils.Timing):164 -> a
+    8:8:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):248:248 -> a
+    9:32: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):434:457 -> a
+    33:33:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):524:524 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1442:1442 -> a
+    34:34:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):524 -> a
+    35:36:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():651:652 -> a
+    35:36:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):524 -> a
+    37:48:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):531:542 -> a
+    49:49:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():30:30 -> a
+    49:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):542 -> a
+    50:57:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):543:550 -> a
+    58:94: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):702:738 -> a
+    95:95:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):566:566 -> a
+    95:95: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):739 -> a
+    96:110: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):740:754 -> a
+    111:111:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):566:566 -> a
+    111:111: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):755 -> a
+    112:121: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):756:765 -> a
+    122:135: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):815:828 -> a
+    136:136: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):825:825 -> a
+    137:148:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):838:849 -> a
+    149:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):854:854 -> a
+    150:309:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):0:159 -> a
+    150:309:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):854 -> a
+    310:317:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):854:861 -> a
+    318:318:int codeUnitMargin():868:868 -> a
+    319:332:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):969:982 -> a
+    333:362:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1144:1173 -> a
+    333:362:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):984 -> a
+    363:392:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):986:1015 -> a
+    393:393:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    393:393:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1015 -> a
+    394:397:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1015:1018 -> a
+    398:438:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1027:1067 -> a
+    439:439:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    439:439:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1067 -> a
+    440:454:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1068:1082 -> a
+    455:455:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    455:455:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1082 -> a
+    456:491:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1084:1119 -> a
+    492:492:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    492:492:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1119 -> a
+    493:493:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1121:1121 -> a
+    494:508:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):873:887 -> a
+    494:508:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    509:509:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    509:509:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):887 -> a
+    509:509:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    510:521:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):893:904 -> a
+    510:521:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    522:522:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    522:522:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):904 -> a
+    522:522:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    523:572:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):905:954 -> a
+    523:572:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    573:573:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
+    573:573:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):955 -> a
+    573:573:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    574:574:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):960:960 -> a
+    574:574:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1122 -> a
+    575:583:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1126:1134 -> a
+    584:584:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1063:1063 -> a
+    585:599:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1184:1198 -> a
+    600:618:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):477:495 -> a
+    600:618:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1199 -> a
+    619:619:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1201:1201 -> a
+    620:633:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):501:514 -> a
+    620:633:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1202 -> a
+    634:650:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1206:1222 -> a
+    651:657:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1455:1461 -> a
+    658:658:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    658:658:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1461 -> a
+    659:726:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1462:1529 -> a
+    727:727:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    727:727:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1530 -> a
+    728:728:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1505:1505 -> a
+    729:731:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1537:1539 -> a
+    732:732:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    732:732:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1539 -> a
+    733:735:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1539:1541 -> a
+    736:746: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):1546:1556 -> a
+    747:755:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1677:1685 -> a
+    756:761:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1704:1709 -> a
+    762:763:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1772:1773 -> a
+    764:770:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1835:1841 -> a
+    771:870:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1869:1968 -> a
+    871:919:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:48 -> a
+    871:919:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1968 -> a
+    920:921:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1969:1970 -> a
+    922:969:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2006:2053 -> a
+    970:971: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):2582:2583 -> a
+    972:972:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2748:2748 -> a
+    973:973:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> a
+    973:973:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2748 -> a
+    974:975:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2748:2749 -> a
+    976:1003:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2759:2786 -> a
+    1004:1004:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> a
+    1004:1004:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2790 -> a
+    1005:1019:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2805:2819 -> a
+    1020:1045:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2996:3021 -> a
+    1046:1048: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):3032:3034 -> a
+    1049:1051: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
+    1049:1051: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):3034 -> a
+    1052:1053: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):3035:3036 -> a
+    1054:1074:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3157:3177 -> a
+    1075:1075: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):35:35 -> a
+    1075:1075:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3177 -> a
+    1076:1092:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3177:3193 -> a
+    1093:1093:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3192:3192 -> a
+    1094:1094:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1094:1094:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3191 -> a
+    1095:1106:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3191:3202 -> a
+    1107:1129:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3213:3235 -> a
+    1130:1130: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
+    1130:1130:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3235 -> a
+    1131:1131:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3236:3236 -> a
+    1132:1166: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):3273:3307 -> a
+    1132:1166:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3240 -> a
+    1167:1189:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3241:3263 -> a
+    1190:1190: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
+    1190:1190:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3263 -> a
+    1191:1195:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3318:3322 -> a
+    1196:1196: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
+    1196:1196:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3322 -> a
+    1197:1201:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3323:3327 -> a
+    1202:1202:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3380:3380 -> a
+    1203:1207:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3386:3390 -> a
+    1203:1207:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1208:1208:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    1208:1208:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3390 -> a
+    1208:1208:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1209:1209:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3395:3395 -> a
+    1209:1209:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1210:1210:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3392:3392 -> a
+    1210:1210:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1211:1211:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1211:1211:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3392 -> a
+    1211:1211:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1212:1212:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3392:3392 -> a
+    1212:1212:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3382 -> a
+    1213:1213: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):3401:3401 -> a
+    1214:1214:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1214:1214: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):3402 -> a
+    1215:1215: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):3404:3404 -> a
+    1216:1216:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1216:1216: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):3404 -> a
+    1217:1218: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):3404:3405 -> a
+    1219:1239:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3415:3435 -> a
+    1240:1240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1240:1240:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434 -> a
+    1241:1247:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3437:3443 -> a
+    1248:1286:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3479 -> a
+    1287:1290: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):1452:1455 -> a
+    1287:1290:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479 -> a
+    1291:1313:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3480:3502 -> a
+    1314:1314:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1314:1314:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3502 -> a
+    1315:1318:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3503:3503 -> a
+    1321:1334:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3506:3519 -> a
+    1335:1342:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523:3530 -> a
+    1343:1353:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3553 -> a
+    1343:1353:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1354:1354:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3531:3531 -> a
+    1355:1380:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3576:3601 -> a
+    1355:1380:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3531 -> a
+    1381:1385:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3532:3536 -> a
+    1386:1386:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3533:3533 -> a
+    1387:1387:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1387:1387:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3533 -> a
+    1388:1388:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1388:1388:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1388:1388:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3533 -> a
+    1389:1389:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3533:3533 -> a
+    1390:1390:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3551:3551 -> a
+    1390:1390:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1391:1391:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1391:1391:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3551 -> a
+    1391:1391:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1392:1392:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1392:1392:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1392:1392:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3551 -> a
+    1392:1392:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1393:1393:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3551:3551 -> a
+    1393:1393:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1394:1394:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3547:3547 -> a
+    1394:1394:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1395:1395:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1395:1395:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3547 -> a
+    1395:1395:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1396:1396:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1396:1396:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1396:1396:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3547 -> a
+    1396:1396:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1397:1397:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3547:3547 -> a
+    1397:1397:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3530 -> a
+    1398:1404:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3557:3563 -> a
+    1:1:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> b
     2:1016:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> b
-    2:1016:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> b
-    1017:1039:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:202 -> b
+    2:1016:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189 -> b
+    1017:1039:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):191:213 -> b
     1040:1040:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> b
-    1040:1040:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):214 -> b
-    1041:1042:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217:218 -> b
+    1040:1040:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):225 -> b
+    1041:1042:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):228:229 -> b
     1043:1043:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    1043:1043:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218 -> b
-    1044:1047:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218:221 -> b
-    1048:1049:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):411:412 -> b
-    1050:1059:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):451:460 -> b
-    1060:1060:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1757:1757 -> b
-    1061:1066:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2324:2329 -> b
-    1067:1067:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2345 -> b
-    1068:1074:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2333:2339 -> b
-    1068:1074:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2346 -> b
-    1075:1077:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2350 -> b
+    1043:1043:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):229 -> b
+    1044:1047:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):229:232 -> b
+    1048:1049:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):422:423 -> b
+    1050:1059:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):462:471 -> b
+    1060:1060:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1781:1781 -> b
+    1061:1066:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2348:2353 -> b
+    1067:1067:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2369:2369 -> b
+    1068:1074:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2357:2363 -> b
+    1068:1074:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2370 -> b
+    1075:1077:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2372:2374 -> b
     1078:1078:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> b
-    1078:1078:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2350 -> b
-    1079:1092:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2351:2364 -> b
-    1093:1102:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2311:2320 -> b
-    1093:1102:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2365 -> b
-    1103:1119:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2366:2382 -> b
-    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1940:1940 -> c
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    1078:1078:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2374 -> b
+    1079:1092:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2375:2388 -> b
+    1093:1102:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2335:2344 -> b
+    1093:1102:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2389 -> b
+    1103:1119:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2390:2406 -> b
+    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1964:1964 -> c
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2620:2620 -> c
     3:3:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> c
-    3:3:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2596 -> c
-    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3400:3400 -> c
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2700:2700 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2595 -> d
+    3:3:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2620 -> c
+    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3424:3424 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2724:2724 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2619 -> d
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2700 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2595 -> d
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2703:2716 -> d
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2595 -> d
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1736:1736 -> e
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2724 -> d
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2619 -> d
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2727:2740 -> d
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2619 -> d
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1760:1760 -> e
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> e
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1736 -> e
-    1:47:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2806:2852 -> f
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1760 -> e
+    1:47:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2830:2876 -> f
     48:48:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1154:1154 -> f
-    48:48:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2852 -> f
-    49:61:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2853:2865 -> f
+    48:48:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2876 -> f
+    49:61:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2877:2889 -> f
     62:62:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> f
-    62:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2865 -> f
-    63:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2865:2867 -> f
-    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2584:2634 -> g
-    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> g
-    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2635 -> g
-    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2637:2646 -> g
-    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2645:2645 -> g
-    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> g
-    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2652 -> g
-    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2655:2655 -> g
-    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2654:2667 -> g
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2666:2666 -> g
-    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> g
-    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2673 -> g
-    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2676:2676 -> g
-    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2675:2694 -> g
-    1:31:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1305:1335 -> h
+    62:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2889 -> f
+    63:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2889:2891 -> f
+    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2608:2658 -> g
+    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> g
+    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2659 -> g
+    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2661:2670 -> g
+    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2669:2669 -> g
+    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> g
+    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2676 -> g
+    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2679:2679 -> g
+    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2678:2691 -> g
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2690:2690 -> g
+    81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> g
+    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2697 -> g
+    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2700:2700 -> g
+    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2699:2718 -> g
+    1:31:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1316:1346 -> h
     32:32:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> h
-    32:32:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1335 -> h
-    33:33:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1336:1336 -> h
+    32:32:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1346 -> h
+    33:33:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1347:1347 -> h
     34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> h
-    34:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1337 -> h
-    35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1339:1344 -> h
-    41:96: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):1376:1431 -> h
-    41:96:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1344 -> h
-    97:104:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1346:1353 -> h
-    105:105:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> h
-    105:105:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1365 -> h
-    106:110:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1366:1370 -> h
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:237 -> i
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):234:240 -> i
+    34:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
+    35:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1350:1355 -> h
+    41:50: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):1387:1396 -> h
+    41:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1355 -> h
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> h
+    51:51: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):1396 -> h
+    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1355 -> h
+    52:103: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):1398:1449 -> h
+    52:103:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1355 -> h
+    104:112:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1356:1364 -> h
+    113:113:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> h
+    113:113:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1376 -> h
+    114:118:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1377:1381 -> h
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):236:248 -> i
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):245:251 -> i
     1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> j
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3098 -> j
-    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3099:3123 -> j
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3122 -> j
+    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3123:3147 -> j
     27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> j
-    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3124 -> j
+    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3148 -> j
     28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> j
-    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3125 -> j
-    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3129:3129 -> j
-    1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1237:1237 -> k
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> k
-    2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1237 -> k
-    3:29:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1237:1263 -> k
-    30:30:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1217:1217 -> k
-    30:30:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1265 -> k
-    31:37:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1226:1232 -> k
-    31:37:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1219 -> k
-    31:37:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1265 -> k
-    38:41:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1219:1222 -> k
-    38:41:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1265 -> k
-    42:62:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1266:1286 -> k
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3149 -> j
+    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3153:3153 -> j
+    1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1248:1248 -> k
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> k
+    2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1248 -> k
+    3:29:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1248:1274 -> k
+    30:30:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1228:1228 -> k
+    30:30:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1276 -> k
+    31:37:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1237:1243 -> k
+    31:37:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1230 -> k
+    31:37:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1276 -> k
+    38:41:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1230:1233 -> k
+    38:41:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1276 -> k
+    42:62:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1277:1297 -> k
     63:63:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> k
-    63:63:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1287 -> k
-    64:65:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1288:1289 -> k
+    63:63:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1298 -> k
+    64:65:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1299:1300 -> k
     66:66:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> k
-    66:66:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1290 -> k
-    67:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1292:1293 -> k
+    66:66:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1301 -> k
+    67:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1303:1304 -> k
     69:69:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> k
-    69:69:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1293 -> k
-    70:72:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1293:1295 -> k
-    1:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):249:282 -> l
-    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():867:867 -> l
-    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284 -> l
-    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286:294 -> l
-    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:41 -> l
-    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):294 -> l
-    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):298:344 -> l
-    93:117:void rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3023:3047 -> l
-    93:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):337 -> l
-    118:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):350:404 -> l
+    69:69:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1304 -> k
+    70:72:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1304:1306 -> k
+    1:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):260:293 -> l
+    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():894:894 -> l
+    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):295 -> l
+    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297:305 -> l
+    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> l
+    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):305 -> l
+    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):309:355 -> l
+    93:117:void rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3047:3071 -> l
+    93:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):348 -> l
+    118:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):361:415 -> l
     173:173:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> l
-    173:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):404 -> l
-    174:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):404:407 -> l
-    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3313:3329 -> m
+    173:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):415 -> l
+    174:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):415:418 -> l
+    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3337:3353 -> m
     18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> m
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3336 -> m
-    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3337:3352 -> m
-    1:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1735:1788 -> n
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3360 -> m
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3361:3376 -> m
+    1:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1759:1812 -> n
     55:55:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():30:30 -> n
-    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1788 -> n
+    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1812 -> n
     56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> n
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1789 -> n
-    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1790:1804 -> n
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1369:1369 -> n
-    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1805 -> n
-    73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1805:1808 -> n
-    77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1835:1836 -> n
-    77:78:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1808 -> n
-    79:88:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1822:1831 -> n
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2059:2059 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> o
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2059 -> o
-    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2062:2070 -> o
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2035:2051 -> o
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> o
-    29:60:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2074:2105 -> o
-    61:77:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1955:1971 -> o
-    61:77:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2106 -> o
-    78:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2110:2156 -> o
-    1:12:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193:2204 -> p
-    13:35:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2162:2184 -> p
-    13:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2206 -> p
-    36:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2207:2220 -> p
-    50:50:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2189:2189 -> p
-    50:50:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2206 -> p
-    1:6:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2392:2397 -> q
-    7:21:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3077:3091 -> q
-    7:21:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> q
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1813 -> n
+    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1814:1828 -> n
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1403:1403 -> n
+    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1829 -> n
+    73:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1829:1832 -> n
+    77:78:void forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1859:1860 -> n
+    77:78:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1832 -> n
+    79:88:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1846:1855 -> n
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083:2083 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> o
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083 -> o
+    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2086:2094 -> o
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2059:2075 -> o
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095 -> o
+    29:60:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2098:2129 -> o
+    61:77:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1979:1995 -> o
+    61:77:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2130 -> o
+    78:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2134:2180 -> o
+    1:12:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2217:2228 -> p
+    13:35:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2186:2208 -> p
+    13:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2230 -> p
+    36:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2231:2244 -> p
+    50:50:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2213:2213 -> p
+    50:50:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2230 -> p
+    1:6:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2416:2421 -> q
+    7:21:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3101:3115 -> q
+    7:21:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2422 -> q
     22:24: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 -> q
-    22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3092 -> q
-    22:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> q
-    25:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3093:3093 -> q
-    25:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2398 -> q
-    26:37:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3051:3062 -> q
-    26:37:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3116 -> q
+    22:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2422 -> q
+    25:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3117:3117 -> q
+    25:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2422 -> q
+    26:37:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3075:3086 -> q
+    26:37:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     38:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> q
-    38:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062 -> q
-    38:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    38:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086 -> q
+    38:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> q
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062 -> q
-    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086 -> q
+    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> q
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062 -> q
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086 -> q
+    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> q
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062 -> q
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086 -> q
+    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> q
-    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062 -> q
-    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
-    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3062:3062 -> q
-    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086 -> q
+    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
+    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3086:3086 -> q
+    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     57:59: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 -> q
-    57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3063 -> q
-    57:59:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
-    60:64:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3064:3068 -> q
-    60:64:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
+    57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3087 -> q
+    57:59:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
+    60:64:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3088:3092 -> q
+    60:64:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
     65:67: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 -> q
-    65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3069 -> q
-    65:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
-    68:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3070:3070 -> q
-    68:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2399 -> q
-    69:71:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2901:2903 -> q
-    69:71:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> q
-    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> q
-    72:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2903 -> q
-    72:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> q
-    73:107:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2904:2938 -> q
-    73:107:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> q
+    65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3093 -> q
+    65:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
+    68:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3094:3094 -> q
+    68:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2423 -> q
+    69:71:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2925:2927 -> q
+    69:71:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2425 -> q
+    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> q
+    72:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2927 -> q
+    72:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2425 -> q
+    73:107:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2928:2962 -> q
+    73:107:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2425 -> q
     108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1574:1574 -> q
-    108:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2939 -> q
-    108:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> q
-    109:130:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2941:2962 -> q
-    109:130:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401 -> q
-    131:154:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2406:2429 -> q
-    155:155:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    155:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2430 -> q
-    156:170:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2433:2447 -> q
-    171:171:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    171:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2448 -> q
-    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2439:2439 -> q
-    173:173:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2440 -> q
-    174:184:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2455:2465 -> q
-    185:185:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    185:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2466 -> q
-    186:201:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2469:2484 -> q
-    202:202:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    202:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2485 -> q
-    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2475:2475 -> q
-    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> q
-    205:209:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2495:2499 -> q
-    210:210:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    210:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2500 -> q
-    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2502:2502 -> q
-    212:212:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2503 -> q
-    213:227:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2508:2522 -> q
-    228:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2521:2521 -> q
-    229:229:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    229:229:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2517 -> q
-    230:235:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2524:2529 -> q
-    236:236:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    236:236:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530 -> q
-    237:237:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532:2532 -> q
-    238:238:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> q
-    238:238:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532 -> q
-    239:241:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2533:2535 -> q
-    242:242:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> q
-    242:242:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2535 -> q
-    243:243:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2536:2536 -> q
-    244:244:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2563:2563 -> q
-    244:244:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2537 -> q
-    245:247:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2547:2549 -> q
+    108:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2963 -> q
+    108:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2425 -> q
+    109:130:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2965:2986 -> q
+    109:130:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2425 -> q
+    131:154:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2453 -> q
+    155:155:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    155:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2454 -> q
+    156:170:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2457:2471 -> q
+    171:171:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    171:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2472 -> q
+    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2463:2463 -> q
+    173:173:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2464 -> q
+    174:184:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479:2489 -> q
+    185:185:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    185:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> q
+    186:201:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2493:2508 -> q
+    202:202:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    202:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2509 -> q
+    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2499 -> q
+    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2500 -> q
+    205:209:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2519:2523 -> q
+    210:210:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    210:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2524 -> q
+    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2526:2526 -> q
+    212:212:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2527 -> q
+    213:227:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532:2546 -> q
+    228:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2545:2545 -> q
+    229:229:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    229:229:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2541 -> q
+    230:235:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2548:2553 -> q
+    236:236:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    236:236:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2554 -> q
+    237:237:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2556:2556 -> q
+    238:238:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> q
+    238:238:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2556 -> q
+    239:241:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2557:2559 -> q
+    242:242:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> q
+    242:242:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2559 -> q
+    243:243:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2560:2560 -> q
+    244:244:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2587:2587 -> q
+    244:244:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2561 -> q
+    245:247:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2571:2573 -> q
     248:248:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> q
-    248:248:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2549 -> q
-    249:252:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2549:2552 -> q
-    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1540:1569 -> r
-    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1580:1610 -> s
+    248:248:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2573 -> q
+    249:252:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2573:2576 -> q
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1564:1593 -> r
+    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1604:1634 -> s
     32:32:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s
-    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1610 -> s
-    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1610:1628 -> s
-    52:65:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1696:1709 -> s
-    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
+    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1634 -> s
+    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1634:1652 -> s
+    52:65:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1720:1733 -> s
+    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
     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 -> s
-    66:66:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1709 -> s
-    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
-    67:67:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1710:1710 -> s
-    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
+    66:66:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1733 -> s
+    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
+    67:67:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1734:1734 -> s
+    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
     68:68:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s
-    68:68:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1710 -> s
-    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
-    69:76:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1711:1718 -> s
-    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
+    68:68:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1734 -> s
+    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
+    69:76:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1735:1742 -> s
+    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
     77:2032:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):0:1955 -> s
-    77:2032:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1721 -> s
-    77:2032:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
-    2033:2033:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1724:1724 -> s
-    2033:2033:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1629 -> s
-    2034:2039:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1667:1672 -> s
-    2034:2039:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1631 -> s
-    2040:2050:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1632:1642 -> s
-    2051:2051:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1674:1674 -> s
-    2051:2051:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1631 -> s
-    2052:2052:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1648:1648 -> s
-    1:40:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3639:3678 -> t
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.j$a:
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.j$b:
+    77:2032:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1745 -> s
+    77:2032:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
+    2033:2033:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1748:1748 -> s
+    2033:2033:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1653 -> s
+    2034:2039:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1691:1696 -> s
+    2034:2039:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1655 -> s
+    2040:2050:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1656:1666 -> s
+    2051:2051:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1698:1698 -> s
+    2051:2051:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1655 -> s
+    2052:2052:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1672:1672 -> s
+    1:40:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3663:3702 -> t
+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>():2227:2227 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2227:2227 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2231:2232 -> <init>
-    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2291:2296 -> a
-    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2302:2306 -> a
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2227:2227 -> doEquivalent
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2240:2240 -> doEquivalent
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2227 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1341:1341 -> doEquivalent
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2240 -> doEquivalent
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2227 -> doEquivalent
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2244:2259 -> doEquivalent
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2227 -> doEquivalent
-    1:1:int doHash(java.lang.Object):2227:2227 -> doHash
-    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2270:2284 -> doHash
-    2:16:int doHash(java.lang.Object):2227 -> doHash
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.j$c:
+    1:1:void <clinit>():2251:2251 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2251:2251 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2255:2256 -> <init>
+    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2315:2320 -> a
+    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2326:2330 -> a
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2251:2251 -> doEquivalent
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2264:2264 -> doEquivalent
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2251 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1375:1375 -> doEquivalent
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2264 -> doEquivalent
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2251 -> doEquivalent
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268:2283 -> doEquivalent
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2251 -> doEquivalent
+    1:1:int doHash(java.lang.Object):2251:2251 -> doHash
+    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2294:2308 -> doHash
+    2:16:int doHash(java.lang.Object):2251 -> 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>():620:620 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):628:629 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):638:638 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):643:643 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):653:653 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():658:663 -> a
+    1:1:void <clinit>():631:631 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):639:640 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):649:649 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):654:654 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):664:664 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():669:674 -> a
     10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():663 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():664:669 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():674 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():675:680 -> 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):1452:1455 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():669 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():671:673 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):648:648 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.j$d:
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():680 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():682:684 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):659:659 -> 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>():139:141 -> <clinit>
+    1:1:void <init>(java.lang.String,int):138:138 -> <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):548:549 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.j$e:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):559:560 -> <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>():757:757 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):761:761 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):759:765 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):757:757 -> a
-    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):795:795 -> a
-    1:1:int getMax():774:774 -> b
-    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):783 -> b
-    2:2:int getMin():770:770 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):783 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):784:784 -> b
+    1:1:void <clinit>():768:768 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):772:772 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):770:776 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):768:768 -> a
+    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):806:806 -> a
+    1:1:int getMax():785:785 -> b
+    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):794 -> b
+    2:2:int getMin():781:781 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):794 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):795:795 -> b
     4:4:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):788 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):788:788 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):799 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):799:799 -> b
     6:6:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):790 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):790:790 -> b
-    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778:778 -> b
-    9:9:int getMax():774:774 -> b
-    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778 -> b
-    10:10:int getMin():770:770 -> b
-    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778 -> b
-    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778:779 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.j$f:
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):801 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):801:801 -> b
+    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):789:789 -> b
+    9:9:int getMax():785:785 -> b
+    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):789 -> b
+    10:10:int getMin():781:781 -> b
+    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):789 -> b
+    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):789:790 -> 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>():1311:1312 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1310:1310 -> <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
@@ -35096,27 +35602,27 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3584:3584 -> <clinit>
-    1:8:void <init>():3584:3591 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3584:3584 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3594:3596 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3600:3632 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.j$g:
+    1:1:void <clinit>():3608:3608 -> <clinit>
+    1:8:void <init>():3608:3615 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3608:3608 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3618:3620 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3624:3656 -> 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):566:566 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):562:562 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):575:575 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):580:580 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):585:585 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):591:612 -> a
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):577:577 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):573:573 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):586:586 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):591:591 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):596:596 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):602:623 -> 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):1482:1485 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):612 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):613:614 -> a
-    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):603:603 -> a
-    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):609:609 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.l:
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):623 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):624:625 -> 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):614:614 -> 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):620:620 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.n:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -35125,61 +35631,61 @@
     int numberOfConstClassCanonicalization -> e
     int numberOfConstNumberCanonicalization -> b
     int numberOfConstStringCanonicalization -> c
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):57:57 -> <init>
-    2:14:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):50:62 -> <init>
-    1:3:void logResults():67:69 -> a
-    4:7:void logResults():68:71 -> a
-    8:12:void logResults():70:74 -> a
-    13:17:void logResults():72:76 -> a
-    18:23:void logResults():75:80 -> a
-    24:30:void logResults():77:83 -> a
-    31:33:void lambda$logResults$0(java.lang.Long,java.lang.Integer):84:84 -> a
-    34:36:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90:92 -> a
-    37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
-    37:37:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
-    38:74:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):126:162 -> a
-    75:76:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):284:285 -> a
-    75:76:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):170 -> a
-    77:136:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):173:232 -> a
-    137:183:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:46 -> a
-    137:183:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):232 -> a
-    184:184:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):249:249 -> a
-    185:208:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:246 -> a
-    209:214:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):235:240 -> a
-    215:267:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):0:52 -> a
-    215:267:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):239 -> a
-    268:271:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217:220 -> a
-    272:320:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):0:48 -> a
-    272:320:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220 -> a
-    321:321:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):251:251 -> a
-    322:333:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):269:280 -> a
-    322:333:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):252 -> a
-    334:337:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):253:256 -> a
-    338:339:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):513:514 -> a
-    338:339:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):256 -> a
-    340:348:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257:265 -> a
-    349:349:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):174:174 -> a
-    350:350:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):191:191 -> a
-    351:351:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):201:201 -> a
-    1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):200:200 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.k:
+    1:1:void <clinit>():43:43 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):56:56 -> <init>
+    2:14:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter):49:61 -> <init>
+    1:3:void logResults():66:68 -> a
+    4:7:void logResults():67:70 -> a
+    8:12:void logResults():69:73 -> a
+    13:17:void logResults():71:75 -> a
+    18:23:void logResults():74:79 -> a
+    24:30:void logResults():76:82 -> a
+    31:33:void lambda$logResults$0(java.lang.Long,java.lang.Integer):83:83 -> a
+    34:35:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:90 -> a
+    36:36:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
+    36:36:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):90 -> a
+    37:74:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):124:161 -> a
+    75:76:boolean constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):283:284 -> a
+    75:76:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):169 -> a
+    77:136:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):172:231 -> a
+    137:185:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:48 -> a
+    137:185:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):231 -> a
+    186:186:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):248:248 -> a
+    187:210:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):222:245 -> a
+    211:216:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):234:239 -> a
+    217:270:com.android.tools.r8.ir.code.DexItemBasedConstString com.android.tools.r8.ir.code.DexItemBasedConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DexItemBasedConstString):0:53 -> a
+    217:270:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):238 -> a
+    271:274:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):216:219 -> a
+    275:323:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.ConstClass.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstClass):0:48 -> a
+    275:323:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):219 -> a
+    324:324:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):250:250 -> a
+    325:336:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):268:279 -> a
+    325:336:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):251 -> a
+    337:340:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):252:255 -> a
+    341:342:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):514:515 -> a
+    341:342:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):255 -> a
+    343:351:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):256:264 -> a
+    352:352:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):173:173 -> a
+    353:353:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):190:190 -> a
+    354:354:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):200:200 -> a
+    1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.ir.optimize.m:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():94:94 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):94:94 -> <init>
-    1:1:boolean equals(java.lang.Object,java.lang.Object):94:94 -> a
-    2:4:boolean equals(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):119:121 -> a
-    2:4:boolean equals(java.lang.Object,java.lang.Object):94 -> a
-    5:5:int hashCode(java.lang.Object):94:94 -> a
-    6:20:int hashCode(com.android.tools.r8.ir.code.Instruction):98:112 -> a
-    6:20:int hashCode(java.lang.Object):94 -> a
-    21:28:int hashCode(com.android.tools.r8.ir.code.Instruction):103:110 -> a
-    21:28:int hashCode(java.lang.Object):94 -> a
-    29:29:int hashCode(com.android.tools.r8.ir.code.Instruction):108:108 -> a
-    29:29:int hashCode(java.lang.Object):94 -> a
-    30:30:int hashCode(com.android.tools.r8.ir.code.Instruction):101:101 -> a
-    30:30:int hashCode(java.lang.Object):94 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.ir.optimize.m:
+    1:1:void <clinit>():92:92 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):92:92 -> <init>
+    1:1:boolean equals(java.lang.Object,java.lang.Object):92:92 -> a
+    2:4:boolean equals(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):117:119 -> a
+    2:4:boolean equals(java.lang.Object,java.lang.Object):92 -> a
+    5:5:int hashCode(java.lang.Object):92:92 -> a
+    6:20:int hashCode(com.android.tools.r8.ir.code.Instruction):96:110 -> a
+    6:20:int hashCode(java.lang.Object):92 -> a
+    21:28:int hashCode(com.android.tools.r8.ir.code.Instruction):101:108 -> a
+    21:28:int hashCode(java.lang.Object):92 -> a
+    29:29:int hashCode(com.android.tools.r8.ir.code.Instruction):106:106 -> a
+    29:29:int hashCode(java.lang.Object):92 -> a
+    30:30:int hashCode(com.android.tools.r8.ir.code.Instruction):99:99 -> a
+    30:30:int hashCode(java.lang.Object):92 -> a
+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
@@ -35200,7 +35706,7 @@
     54:57:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):144:147 -> a
     58:83:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):176:201 -> a
     58:83:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):148 -> a
-    84:84:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    84:84:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     84:84:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):201 -> a
     84:84:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):148 -> a
     85:92:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):201:208 -> a
@@ -35209,7 +35715,7 @@
     1:9:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):61:69 -> b
     10:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):67:72 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):71:71 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.n:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.ir.optimize.p:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.Inliner inliner -> b
@@ -35218,139 +35724,139 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.ProgramMethod method -> c
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy reasonStrategy -> e
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):67:74 -> <init>
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):66:73 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isForcedInliningOracle() -> a
-    1:18:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):91:108 -> a
-    1:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):263 -> a
-    19:38:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):267:286 -> a
-    39:41:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):92:94 -> a
-    39:41:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):263 -> a
-    42:51:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):121:130 -> a
-    52:52:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    52:52:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):130 -> a
-    53:80:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):130:157 -> a
-    81:132:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):156:207 -> a
-    133:133:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):206:206 -> a
-    134:138:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):212:216 -> a
-    139:139:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):215:215 -> a
-    140:140:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):253:253 -> a
-    141:164:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):295:318 -> a
-    165:169:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):330:334 -> a
-    170:182:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):331:343 -> a
-    183:187:boolean isTargetClassInitialized(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):359:363 -> a
-    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    188:188:boolean isTargetClassInitialized(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):363 -> a
-    189:199:boolean isTargetClassInitialized(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):364:374 -> a
-    200:210:boolean isTargetClassInitialized(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):370:380 -> a
-    211:226:boolean isTargetClassInitialized(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):379:394 -> a
-    227:227:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):373:373 -> a
-    228:228:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):372:372 -> a
-    229:231:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):404:406 -> a
-    232:232:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    232:232:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):406 -> a
-    233:233:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):408:408 -> a
-    234:234:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):878:878 -> a
-    234:234:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):408 -> a
-    235:235:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):873:873 -> a
-    235:235:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):408 -> a
-    236:247:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):417:428 -> a
-    248:340:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):444:536 -> a
-    341:346:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):543:548 -> a
-    347:347: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):560:560 -> a
-    348:350:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):571:573 -> a
-    348:350: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):563 -> a
-    351:351: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):564:564 -> a
-    352:368:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):658:674 -> a
-    352:368: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):565 -> a
-    369:401:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):593:625 -> a
-    402:402:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):684:684 -> a
+    1:18:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):90:107 -> a
+    1:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):264 -> a
+    19:39:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):268:288 -> a
+    40:42:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):91:93 -> a
+    40:42:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):264 -> a
+    43:52:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):121:130 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    53:53:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):130 -> a
+    54:81:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):130:157 -> a
+    82:85:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):156:159 -> a
+    86:86:boolean com.android.tools.r8.features.FeatureSplitConfiguration.isInBase(com.android.tools.r8.graph.DexProgramClass):120:120 -> a
+    86:86:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):159 -> a
+    87:99:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):160:172 -> a
+    100:167:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.ResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):0:67 -> a
+    100:167:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172 -> a
+    168:203:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172:207 -> a
+    204:204:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):206:206 -> a
+    205:209:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):212:216 -> a
+    210:210:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):215:215 -> a
+    211:211:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):253:253 -> a
+    212:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:320 -> a
+    236:245:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):332:341 -> a
+    246:257:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):357:368 -> a
+    258:267:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):365:374 -> a
+    268:283:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):373:388 -> a
+    284:284:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):367:367 -> a
+    285:287:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):398:400 -> a
+    288:288:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    288:288:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):400 -> a
+    289:289:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):402:402 -> a
+    290:290:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):865:865 -> a
+    290:290:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):402 -> a
+    291:291:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):859:859 -> a
+    291:291:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):402 -> a
+    292:303:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:422 -> a
+    304:396:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):438:530 -> a
+    397:402:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):537:542 -> a
+    403:403: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):554:554 -> a
+    404:406:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):565:567 -> a
+    404:406: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):557 -> a
+    407:407: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):558:558 -> a
+    408:424:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):652:668 -> a
+    408:424: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):559 -> a
+    425:457:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):587:619 -> a
+    458:458:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):678:678 -> a
     1:1:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):222:222 -> b
     2:13:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):231:242 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):223 -> b
     14:14:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):224:224 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.o:
+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>():47:47 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):51:52 -> <init>
-    1:3:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):56:58 -> a
-    4:4:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    4:4:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):58 -> a
-    5:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):59:85 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():202:202 -> a
-    32:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):85 -> a
-    33:59:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):86:112 -> a
-    60:77:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):111:128 -> a
-    78:82:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):127:131 -> a
-    83:95:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):130:142 -> a
-    96:99: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):283:286 -> a
-    96:99:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    100:100:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    100:100: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):286 -> a
-    100:100:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    101:119: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):288:306 -> a
-    101:119:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    120:120:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    120:120: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):306 -> a
-    120:120:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    121:127: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):308:314 -> a
-    121:127:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):142 -> a
-    128:130:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):144:144 -> a
-    136:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):150:159 -> a
-    146:146:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    146:146:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):159 -> a
-    147:194:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):161:208 -> a
-    195:195:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    195:195:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):215 -> a
-    196:218:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):217:239 -> a
-    219:219:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    219:219:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):239 -> a
-    220:235:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):241:256 -> a
-    236:247:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):255:266 -> a
-    248:248:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    248:248:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):266 -> a
-    249:251:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass):266:268 -> a
-    252:252:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):318:318 -> a
-    253:259:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):322:328 -> a
-    260:260:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    260:260:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):328 -> a
-    261:261:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> a
-    261:261:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):333 -> a
-    262:265:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):336:339 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.ir.optimize.p:
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):50:51 -> <init>
+    1:4:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):55:58 -> a
+    5:5:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    5:5:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):58 -> a
+    6:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):59:85 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():177:177 -> a
+    33:33:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):85 -> a
+    34:60:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):86:112 -> a
+    61:81:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):111:131 -> a
+    82:90:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):127:135 -> a
+    91:103:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):134:146 -> a
+    104:107: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.ProgramMethod):287:290 -> a
+    104:107:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):146 -> a
+    108:108:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    108:108: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.ProgramMethod):290 -> a
+    108:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):146 -> a
+    109:128: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.ProgramMethod):292:311 -> a
+    109:128:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):146 -> a
+    129:129:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    129:129: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.ProgramMethod):311 -> a
+    129:129:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):146 -> a
+    130:136: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.ProgramMethod):313:319 -> a
+    130:136:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):146 -> a
+    137:139:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):148:148 -> a
+    145:154:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):154:163 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    155:155:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):163 -> a
+    156:203:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):165:212 -> a
+    204:204:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    204:204:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):219 -> a
+    205:227:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):221:243 -> a
+    228:228:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    228:228:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):243 -> a
+    229:244:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):245:260 -> a
+    245:256:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):259:270 -> a
+    257:257:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    257:257:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):270 -> a
+    258:260:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):270:272 -> a
+    261:261:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):323:323 -> a
+    262:268:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):328:334 -> a
+    269:269:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    269:269:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):334 -> a
+    270:276:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):339:345 -> a
+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>():34:34 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView):38:39 -> <init>
-    1:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45:47 -> a
-    4:89:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):57:142 -> a
-    4:89:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):48 -> a
-    90:95:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):141:146 -> a
-    90:95:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):48 -> a
-    96:110:com.android.tools.r8.ir.analysis.type.ClassTypeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170:184 -> a
-    1:10:com.android.tools.r8.ir.analysis.type.TypeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):157:166 -> b
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.q:
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):40:41 -> <init>
+    1:4:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):55:58 -> a
+    5:90:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):69:154 -> a
+    5:90:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):59 -> a
+    91:96:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):153:158 -> a
+    91:96:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):59 -> a
+    97:97:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.function.Predicate,com.android.tools.r8.utils.Timing):62:62 -> a
+    98:112:com.android.tools.r8.ir.analysis.type.ClassTypeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):182:196 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):169:178 -> b
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.ir.optimize.s:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Map):31:34 -> <init>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Map):32:35 -> <init>
     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.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
-    boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-    1:5:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):53:57 -> a
-    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.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,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):130:133 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.s:
+    1:5:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):55:59 -> a
+    6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):77:89 -> a
+    6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):70 -> a
+    19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):135:138 -> a
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.u:
     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
@@ -35369,28 +35875,30 @@
     19:19:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy):184:184 -> a
     19:19:void canonicalize(com.android.tools.r8.ir.code.IRCode):95 -> a
     20:33:void canonicalize(com.android.tools.r8.ir.code.IRCode):113:126 -> a
-    34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):259:265 -> a
+    34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):274:280 -> a
     34:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
-    41:56:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:146 -> a
-    57:93:void canonicalize(com.android.tools.r8.ir.code.IRCode):145:181 -> a
-    94:94:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
-    94:94:void canonicalize(com.android.tools.r8.ir.code.IRCode):184 -> a
-    95:164:void canonicalize(com.android.tools.r8.ir.code.IRCode):186:255 -> a
-    165:165:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):171:171 -> a
-    166:166:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):188:188 -> a
-    167:167:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):196:196 -> a
-    168:171:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):200:203 -> a
-    172:187:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):202:217 -> a
-    188:188: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
-    188:188:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):212 -> a
-    189:192:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):223:226 -> a
-    193:203:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):297:307 -> a
-    193:203:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):228 -> a
-    204:205:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):230:231 -> a
-    206:228:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):270:292 -> a
-    229:229:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):287:287 -> 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:
+    41:53:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:143 -> a
+    54:54:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.ResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):67:67 -> a
+    54:54:void canonicalize(com.android.tools.r8.ir.code.IRCode):146 -> a
+    55:104:void canonicalize(com.android.tools.r8.ir.code.IRCode):147:196 -> a
+    105:105:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    105:105:void canonicalize(com.android.tools.r8.ir.code.IRCode):199 -> a
+    106:175:void canonicalize(com.android.tools.r8.ir.code.IRCode):201:270 -> a
+    176:176:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):186:186 -> a
+    177:177:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):203:203 -> a
+    178:178:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):211:211 -> a
+    179:182:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):215:218 -> a
+    183:198:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):217:232 -> a
+    199:199: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):67:67 -> a
+    199:199:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):227 -> a
+    200:203:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):238:241 -> a
+    204:214:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):312:322 -> a
+    204:214:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):243 -> a
+    215:216:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):245:246 -> a
+    217:239:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):285:307 -> a
+    240:240:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):302:302 -> a
+    1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):210:210 -> b
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.ir.optimize.t:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -35400,7 +35908,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.v:
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -35412,76 +35920,71 @@
     boolean applyDoubleInlining -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet doubleInlineCallers -> g
     java.util.Set blacklist -> b
-    1:1:void <clinit>():81:81 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):102:102 -> <init>
-    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):90:115 -> <init>
+    1:1:void <clinit>():83:83 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):104:104 -> <init>
+    2:27:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):92:117 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:19:boolean isBlacklisted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):120:138 -> a
-    20:20:boolean isBlacklisted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):133:133 -> a
-    21:21:boolean hasInliningAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):203:203 -> a
-    22:28:boolean hasInliningAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):202:208 -> a
-    29:29:boolean hasInliningAccess(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):207:207 -> a
-    30:37:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):212:219 -> a
-    38:38:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> a
-    38:38:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):219 -> a
-    39:39:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> a
-    39:39:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):222 -> a
-    40:40:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):226:226 -> a
-    41:42:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():260:261 -> a
-    43:67:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):814:838 -> a
-    68:70:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):863:865 -> a
-    71:71:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):864:864 -> a
-    72:78:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):887:893 -> a
-    79:79:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):929:929 -> a
-    79:79:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):889 -> a
-    80:83:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):895:898 -> a
-    84:86:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):903:905 -> a
-    87:87:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):906:906 -> a
-    88:88:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):920:920 -> a
-    89:89:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):929:929 -> a
-    89:89:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):915 -> a
-    90:114:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):946:970 -> a
-    115:125:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):969:979 -> a
-    126:142:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):978:994 -> a
-    143:188:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):993:1038 -> a
-    189:199:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1110:1120 -> a
-    189:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1044 -> a
-    200:216:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1038:1054 -> a
-    217:217:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():329:329 -> a
-    217:217:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1054 -> a
-    218:238:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1054:1074 -> a
-    239:241:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):71:73 -> a
-    239:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1074 -> a
-    242:242:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1075:1075 -> a
-    243:243:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):77:77 -> a
-    243:243:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1074 -> a
-    244:255:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):1077:1088 -> a
-    256:262:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1092:1098 -> a
-    256:262:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):160 -> a
-    263:263:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    263:263:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1098 -> a
-    263:263:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):160 -> a
-    264:265:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1099:1100 -> a
-    264:265:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):160 -> a
-    266:279:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):161:174 -> a
-    280:282:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):152:154 -> a
-    280:282:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):174 -> a
-    283:283:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):180:180 -> a
-    284:323:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1129:1168 -> a
-    324:326:void applyAssumerToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1178:1180 -> a
-    327:332:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1188:1193 -> a
-    333:333:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    333:333:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1193 -> a
-    334:336:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1193:1195 -> a
-    337:340:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1201:1204 -> a
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):122:140 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):135:135 -> a
+    21:27:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):188:194 -> a
+    28:28:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():981:981 -> a
+    28:28:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):194 -> a
+    29:29:boolean isDoubleInlineSelectedTarget(com.android.tools.r8.graph.ProgramMethod):204:204 -> a
+    30:42:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):220:232 -> a
+    43:44:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():238:239 -> a
+    45:51:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):842:848 -> a
+    52:52:void performForcedInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):843:843 -> a
+    53:59:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):875:881 -> a
+    60:60:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):917:917 -> a
+    60:60:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):877 -> a
+    61:64:void performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):883:886 -> a
+    65:67:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):891:893 -> a
+    68:68:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy lambda$createDefaultInliningReasonStrategy$0(com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):894:894 -> a
+    69:69:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):908:908 -> a
+    70:70:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):917:917 -> a
+    70:70:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,int):903 -> a
+    71:129:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):935:993 -> a
+    130:175:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):992:1037 -> a
+    176:186:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1109:1119 -> a
+    176:186:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1043 -> a
+    187:200:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1037:1050 -> a
+    201:232:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1132:1163 -> a
+    201:232:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1050 -> a
+    233:233:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1053:1053 -> a
+    234:234:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():326:326 -> a
+    234:234:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1053 -> a
+    235:235:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1053:1053 -> a
+    236:236:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():326:326 -> a
+    236:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1053 -> a
+    237:256:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1054:1073 -> a
+    257:259:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):71:73 -> a
+    257:259:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1073 -> a
+    260:260:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1074:1074 -> a
+    261:261:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):77:77 -> a
+    261:261:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1073 -> a
+    262:273:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1076:1087 -> a
+    274:280:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1091:1097 -> a
+    274:280:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):161 -> a
+    281:281:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    281:281:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1097 -> a
+    281:281:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):161 -> a
+    282:283:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1098:1099 -> a
+    282:283:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):161 -> a
+    284:296:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):162:174 -> a
+    297:299:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):153:155 -> a
+    297:299:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):176 -> a
+    300:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):182:182 -> a
+    301:303:void applyAssumerToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.utils.Timing):1174:1176 -> a
+    304:309:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1184:1189 -> a
+    310:310:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    310:310:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1189 -> a
+    311:313:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):1189:1191 -> a
+    314:317:void rewindBlockIteratorToFirstInlineeBlock(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1197:1200 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):186:192 -> b
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():954:954 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):192 -> b
-    9:21:void recordDoubleInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):242:254 -> b
-    1:1:boolean isDoubleInliningEnabled():146:146 -> c
-    2:8:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):231:237 -> c
-com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.t$a:
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):209:215 -> b
+    8:32:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):792:816 -> b
+    1:1:boolean isDoubleInliningEnabled():148:148 -> c
+com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.v$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
@@ -35491,124 +35994,115 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
     int value -> a
-    1:18:void <clinit>():277:277 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):297:298 -> <init>
-    1:1:boolean isSet(int):310:310 -> b
-com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.t$b:
+    1:18:void <clinit>():255:255 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):275:276 -> <init>
+    1:1:boolean isSet(int):288:288 -> b
+com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.v$b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():328:336 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):338:341 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):344:348 -> <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):371:373 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> 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):374 -> 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):375:383 -> a
-    14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> 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):384 -> 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):386:390 -> a
-    20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):104:104 -> 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):393 -> 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):394:394 -> 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):400:405 -> a
-    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> 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):408 -> 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):410:411 -> 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):416:466 -> a
-    82:82:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):543:543 -> 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):466 -> a
-    83:83:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    83:83:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):544 -> 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):466 -> a
-    84:89:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):545:550 -> 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):466 -> a
-    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    90:90:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):550 -> 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):466 -> a
-    91:93:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):551:553 -> 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):466 -> 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):467:474 -> a
-    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    102:102:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):520 -> 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):474 -> a
-    103:110:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):522:529 -> 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):474 -> a
-    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    111:111:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):529 -> 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):474 -> a
-    112:116:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):531:535 -> a
-    112:116: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):474 -> a
-    117:150: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):478:511 -> a
-    1:5:boolean equals(java.lang.Object):361:365 -> equals
-    1:4:int hashCode():353:356 -> hashCode
+    1:9:void <clinit>():306:314 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):316:319 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):322:326 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):349:372 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):378:383 -> a
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):386 -> a
+    32:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):388:389 -> a
+    34:84: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):394:444 -> a
+    85:85:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):521:521 -> a
+    85:85: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):444 -> a
+    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    86:86:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):522 -> a
+    86:86: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):444 -> a
+    87:92:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):523:528 -> a
+    87:92: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):444 -> a
+    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    93:93:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):528 -> a
+    93: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):444 -> a
+    94:96:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):529:531 -> a
+    94:96: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):444 -> a
+    97:104: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):445:452 -> a
+    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    105:105:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):498 -> a
+    105:105: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):452 -> a
+    106:113:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):500:507 -> a
+    106:113: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):452 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    114:114:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507 -> a
+    114:114: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):452 -> a
+    115:119:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):509:513 -> a
+    115:119: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):452 -> a
+    120:153: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):456:489 -> a
+    1:5:boolean equals(java.lang.Object):339:343 -> equals
+    1:4:int hashCode():331:334 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():54:54 -> hashCode
-    5:5:int hashCode():356 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.t$c:
+    5:5:int hashCode():334 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.v$c:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     boolean shouldSynthesizeInitClass -> c
     boolean shouldSynthesizeNullCheckForReceiver -> d
-    1:1:void <clinit>():579:579 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):588:591 -> <init>
-    1:2:void setShouldSynthesizeInitClass():595:596 -> a
-    3:11:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):611:619 -> a
-    12:23:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):758:769 -> a
-    12:23:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):620 -> a
+    1:1:void <clinit>():557:557 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):566:569 -> <init>
+    1:2:void setShouldSynthesizeInitClass():573:574 -> a
+    3:11:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:597 -> a
+    12:23:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):736:747 -> a
+    12:23:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):598 -> a
     24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    24:24:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):769 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):620 -> a
-    25:25:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):769:769 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):620 -> a
-    26:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:631 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):631 -> a
-    29:31:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):632:634 -> a
-    32:55:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):773:796 -> a
-    32:55:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):636 -> a
-    56:58:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):641:643 -> a
-    59:83:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):642:666 -> a
-    84:89:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):665:670 -> a
+    24:24:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):747 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):598 -> a
+    25:25:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):747:747 -> a
+    25:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):598 -> a
+    26:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):608:609 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    28:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):609 -> a
+    29:31:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):610:612 -> a
+    32:55:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):751:774 -> a
+    32:55:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):614 -> a
+    56:58:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):619:621 -> a
+    59:83:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):620:644 -> a
+    84:89:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):643:648 -> a
     90:90:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    90:90:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):672 -> a
-    91:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):672:672 -> a
-    92:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:679 -> a
+    90:90:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):650 -> a
+    91:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):650:650 -> a
+    92:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):648:657 -> a
     102:102:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> a
-    102:102:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):681 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):681:681 -> a
+    102:102:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):659 -> a
+    103:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):659:659 -> a
     104:104:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1137:1137 -> a
-    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):683 -> a
-    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):684:685 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):661 -> a
+    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):662:663 -> a
     107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):142:142 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):687 -> a
-    108:136:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):691:719 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):665 -> a
+    108:136:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):669:697 -> a
     137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    137:137:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):718 -> a
-    138:172:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):720:754 -> a
-    173:173:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):686:686 -> a
-    1:2:void setShouldSynthesizeNullCheckForReceiver():600:601 -> b
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.u:
+    137:137:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):696 -> a
+    138:172:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):698:732 -> a
+    173:173:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):664:664 -> a
+    1:2:void setShouldSynthesizeNullCheckForReceiver():578:579 -> b
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.w:
     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):806:808 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.v:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):784:786 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.x:
     com.android.tools.r8.graph.DexType receiverType -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):852:854 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.t$d:
+    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):830:832 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.v$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
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:6:void <clinit>():566:571 -> <clinit>
-    1:1:void <init>(java.lang.String,int):565:565 -> <init>
-    1:1:boolean mustBeInlined():575:575 -> a
-com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.w:
+    1:6:void <clinit>():544:549 -> <clinit>
+    1:1:void <init>(java.lang.String,int):543:543 -> <init>
+    1:1:boolean mustBeInlined():553:553 -> a
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.y:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -35617,70 +36111,66 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):45:45 -> <init>
     2:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):31:49 -> <init>
     1:1:void disallowStaticInterfaceMethodCalls():61:61 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):98:98 -> a
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):134:136 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):135:135 -> a
-    7:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):150:166 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):235:235 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):164 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeCustom():172:172 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):162 -> a
-    26:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):256:257 -> a
-    26:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):160 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):252:252 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):158 -> a
-    29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):156:156 -> a
-    30:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):219:220 -> a
-    30:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):154 -> a
-    32:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):152:152 -> a
-    33:54:com.android.tools.r8.graph.DexEncodedMethod lookupWhileVerticalClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):179:200 -> a
-    55:55:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):207:207 -> a
-    56:56:boolean isVerticalClassMerging():65:65 -> a
-    56:56:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):209 -> a
-    57:62:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):210:215 -> a
-    63:63:com.android.tools.r8.graph.DexEncodedMethod lambda$forInvokeDirect$0(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass):213:213 -> a
-    64:64:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):252:252 -> a
-    65:66: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):346:347 -> a
-    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    67:67: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):347 -> a
-    68:81: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):349:362 -> a
-    82:95: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):360:373 -> a
-    96:101: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):378:383 -> a
-    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    102:102: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):383 -> a
-    103:119: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):385:401 -> a
-    120:139:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):408:427 -> a
-    140:140:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    140:140:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):427 -> a
-    141:153:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):428:440 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):98:98 -> a
+    3:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):134:135 -> a
+    5:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):148:164 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokePolymorphic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):226:226 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):162 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeCustom():170:170 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    24:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):247:248 -> a
+    24:25:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):158 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):243:243 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):156 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):154:154 -> a
+    28:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):213:214 -> a
+    28:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):152 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexProgramClass):150:150 -> a
+    31:48:com.android.tools.r8.graph.DexEncodedMethod lookupWhileVerticalClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.BiFunction):177:194 -> a
+    49:49:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):201:201 -> a
+    50:50:boolean isVerticalClassMerging():65:65 -> a
+    50:50:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):203 -> a
+    51:56:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):204:209 -> a
+    57:57:com.android.tools.r8.graph.DexEncodedMethod lambda$forInvokeDirect$0(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass):207:207 -> a
+    58:58:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):243:243 -> a
+    59: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.DexProgramClass):332:333 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    61:61: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.DexProgramClass):333 -> a
+    62: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.DexProgramClass):335:347 -> a
+    75:88: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.DexProgramClass):345:358 -> a
+    89:94: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.DexProgramClass):363:368 -> a
+    95:95:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    95:95: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.DexProgramClass):368 -> a
+    96:112: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.DexProgramClass):370:386 -> a
+    113:131:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,boolean):391:409 -> a
+    132:132:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    132:132:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,boolean):409 -> a
+    133:145:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,boolean):410:422 -> a
     1:1:com.android.tools.r8.graph.AppView getAppView():53:53 -> b
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):102:102 -> b
-    3:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):144:146 -> b
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):145:145 -> b
-    7:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):219:220 -> b
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lambda$forInvokeStatic$1(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass):245:245 -> b
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):102:102 -> b
+    3:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):143:144 -> b
+    5:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):213:214 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lambda$forInvokeStatic$1(com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass):236:236 -> b
     1:1:com.android.tools.r8.graph.GraphLense getGraphLense():57:57 -> c
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):130:130 -> c
-    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):239:239 -> c
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):130:130 -> c
+    3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):230:230 -> c
     4:4:boolean isVerticalClassMerging():65:65 -> c
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):241 -> c
-    5:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):242:247 -> c
-    11:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):308:310 -> c
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):309:309 -> c
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):140:140 -> d
-    2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):256:257 -> d
-    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):314:316 -> d
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):315:315 -> d
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):227:227 -> e
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> f
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):284:284 -> g
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):292:292 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.x:
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):232 -> c
+    5:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):233:238 -> c
+    11:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):296:297 -> c
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):139:139 -> d
+    2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):247:248 -> d
+    4:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):301:302 -> d
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):218:218 -> e
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):222:222 -> f
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):272:272 -> g
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):280:280 -> h
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.z:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-    boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.y:
+    boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.A:
     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.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
@@ -35688,7 +36178,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.z:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.B:
     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
@@ -35696,7 +36186,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.C:
     java.util.Map memberPools -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
@@ -35706,71 +36196,71 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.graph.SubtypingInfo):42:42 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.base.Equivalence,com.android.tools.r8.graph.SubtypingInfo):37:45 -> <init>
     java.lang.Runnable computeMemberPoolForClass(com.android.tools.r8.graph.DexClass) -> a
-    1:13:void buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:61 -> a
-    14:18:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):67:71 -> a
-    19:19:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):103:103 -> a
-    19:19:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70 -> a
-    20:20:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
-    20:20:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):104 -> a
+    1:14:void buildAll(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:62 -> a
+    15:19:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):67:71 -> a
+    20:20:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):103:103 -> a
     20:20:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70 -> a
-    21:21:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72:72 -> a
-    22:22:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):103:103 -> a
-    22:22:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72 -> a
-    23:23:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
-    23:23:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):104 -> a
+    21:21:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
+    21:21:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):104 -> a
+    21:21:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):70 -> a
+    22:22:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72:72 -> a
+    23:23:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):103:103 -> a
     23:23:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72 -> a
-    24:28:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73:77 -> a
-    29:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:75 -> a
-    30:35:boolean markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):90:95 -> a
-    36:36:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
-    36:36:void lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):58 -> a
-    37:39:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):138:140 -> a
-    40:40:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    40:40:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):140 -> a
-    41:41:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):142:142 -> a
-    42:42:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):228:228 -> a
-    42:42:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):142 -> a
-    43:49:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):144:150 -> a
-    50:50:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    50:50:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):150 -> a
-    51:51:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152:152 -> a
-    52:52:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):228:228 -> a
-    52:52:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152 -> a
-    53:53:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141:141 -> a
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    54:54:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
-    55:55:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> a
-    55:55:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
+    24:24:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
+    24:24:void submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):104 -> a
+    24:24:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):72 -> a
+    25:29:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73:77 -> a
+    30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool buildForHierarchy(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:76 -> a
+    32:37:boolean markIfNotSeen(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMember):90:95 -> a
+    38:38:void submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):109:109 -> a
+    38:38:void lambda$buildAll$0(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):58 -> a
+    39:41:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):138:140 -> a
+    42:42:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
+    42:42:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):140 -> a
+    43:43:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):142:142 -> a
+    44:44:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):228:228 -> a
+    44:44:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):142 -> a
+    45:51:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):144:150 -> a
+    52:52:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
+    52:52:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):150 -> a
+    53:53:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152:152 -> a
+    54:54:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):228:228 -> a
+    54:54:java.util.Set getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152 -> a
+    55:55:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141:141 -> a
+    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    56:56:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
+    57:57:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> a
+    57:57:void lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool get(com.android.tools.r8.graph.DexClass):85:85 -> b
     2:2:boolean hasPool(com.android.tools.r8.graph.DexClass):81:81 -> b
     2:2:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool get(com.android.tools.r8.graph.DexClass):85 -> b
     3:4:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool get(com.android.tools.r8.graph.DexClass):85:86 -> b
     5:15:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):116:126 -> b
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     16:16:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):126 -> b
     17:17:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     17:17:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):126 -> b
     18:19:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):128:129 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     20:20:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):129 -> b
     21:21:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     21:21:java.util.Set getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):129 -> b
     22:22:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143:143 -> b
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     23:23:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> b
     24:24:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     24:24:void lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> b
     1:1:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151:151 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
     2:2:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151 -> c
     3:3:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> c
     3:3:void lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151 -> c
     1:1:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153:153 -> d
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> d
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> d
     2:2:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153 -> d
     3:3:void addNonNull(java.util.Collection,java.lang.Object):231:231 -> d
     3:3:void lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153 -> 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.C$a:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -35800,7 +36290,7 @@
     4:4:boolean lambda$hasSeenBelow$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):225:225 -> c
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):216:216 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):191:192 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.C:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.ir.optimize.F:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -35824,71 +36314,83 @@
     73:80:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):214:221 -> a
     81:88:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):330:337 -> a
     89:92:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):336:339 -> a
-    93:93:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    93:93:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     93:93:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):344 -> a
     94:94:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):344:344 -> a
     95:99:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):99:103 -> a
     95:99:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):348 -> a
-    100:115:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):353:368 -> a
-    116:116:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    116:116:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):368 -> a
-    117:120:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):370:373 -> a
-    121:121:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    121:121:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):376 -> a
-    122:126:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):378:382 -> a
-    127:159:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):380:412 -> a
-    160:171:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):411:422 -> a
-    172:172:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):337:337 -> a
-    173:195:void replaceInstructionByNullCheckIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):429:451 -> a
-    196:207:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):460:471 -> a
-    208:221:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):466:479 -> a
-    222:222:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    222:222:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):479 -> a
-    223:225:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):479:481 -> a
-    226:226:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    226:226:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):481 -> a
-    227:227:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType):482:482 -> a
-    228:228:boolean lambda$replaceInstructionByInitClassIfPossible$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):470:470 -> a
-    229:236:void run(com.android.tools.r8.ir.code.IRCode):521:528 -> a
-    237:237:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    237:237:void run(com.android.tools.r8.ir.code.IRCode):528 -> a
-    238:240:void run(com.android.tools.r8.ir.code.IRCode):528:530 -> a
-    241:252:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):538:549 -> a
-    253:302:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):234:283 -> a
-    253:302:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    303:307:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):107:111 -> a
-    303:307:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):287 -> a
-    303:307:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    308:326:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):291:309 -> a
-    308:326:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    327:338:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):308:319 -> a
-    327:338:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548 -> a
-    339:341:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):550:552 -> a
-    342:345:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551:554 -> a
-    346:347:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):488:489 -> a
-    346:347:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    348:348:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    348:348:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):493 -> a
-    348:348:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    349:349:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):497:497 -> a
-    349:349:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554 -> a
-    350:351:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555:556 -> a
-    352:353:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):502:503 -> a
-    352:353:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    354:354:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    354:354:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):507 -> a
-    354:354:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    355:355:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):512:512 -> a
-    355:355:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-    356:356:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
-    356:356:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.B:
+    100:112:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):353:365 -> a
+    113:113:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    113:113:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):365 -> a
+    114:117:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):367:370 -> a
+    118:118:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    118:118:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):373 -> a
+    119:123:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):375:379 -> a
+    124:156:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):377:409 -> a
+    157:168:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):408:419 -> a
+    169:169:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):337:337 -> a
+    170:192:void replaceInstructionByNullCheckIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):426:448 -> a
+    193:204:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):457:468 -> a
+    205:218:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):463:476 -> a
+    219:219:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    219:219:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):476 -> a
+    220:222:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):476:478 -> a
+    223:223:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    223:223:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):478 -> a
+    224:224:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):479:479 -> a
+    225:225:boolean lambda$replaceInstructionByInitClassIfPossible$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):467:467 -> a
+    226:233:void run(com.android.tools.r8.ir.code.IRCode):524:531 -> a
+    234:234:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    234:234:void run(com.android.tools.r8.ir.code.IRCode):531 -> a
+    235:237:void run(com.android.tools.r8.ir.code.IRCode):531:533 -> a
+    238:249:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):541:552 -> a
+    250:299:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):234:283 -> a
+    250:299:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551 -> a
+    300:304:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):107:111 -> a
+    300:304:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):287 -> a
+    300:304:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551 -> a
+    305:323:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):291:309 -> a
+    305:323:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551 -> a
+    324:335:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):308:319 -> a
+    324:335:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551 -> a
+    336:338:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):553:555 -> a
+    339:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):554:557 -> a
+    343:343:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):485:485 -> a
+    343:343:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    344:344:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    344:344:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):486 -> a
+    344:344:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    345:345:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():46:46 -> a
+    345:345:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):493 -> a
+    345:345:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    346:350:void replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):493:497 -> a
+    346:350:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    351:352:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):558:559 -> a
+    353:353:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):502:502 -> a
+    353:353:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):559 -> a
+    354:354:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    354:354:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):503 -> a
+    354:354:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):559 -> a
+    355:355:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():46:46 -> a
+    355:355:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):510 -> a
+    355:355:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):559 -> a
+    356:361:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):510:515 -> a
+    356:361:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):559 -> a
+    362:362:void replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):514:514 -> a
+    362:362:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):559 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.D:
     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):73:75 -> <init>
     1:5:boolean equals(java.lang.Object):80:84 -> equals
     1:1:int hashCode():89:89 -> hashCode
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.D:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.E:
+    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>():63:65 -> <clinit>
+    1:1:void <init>(java.lang.String,int):62:62 -> <init>
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.G:
     java.util.function.Predicate methodTester -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):38:38 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.util.function.Predicate):45:46 -> <init>
@@ -35899,13 +36401,13 @@
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):68:68 -> d
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):78:78 -> e
     1:10:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):56:65 -> f
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> f
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> f
     11:11:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):65 -> f
     12:20:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):67:75 -> f
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> f
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> f
     21:21:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):75 -> f
     22:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):77:80 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.E:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.ir.optimize.H:
     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>
@@ -35913,13 +36415,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.F:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.ir.optimize.I:
     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):216:216 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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
@@ -35943,7 +36445,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):216:216 -> a
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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
@@ -35951,16 +36453,16 @@
     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.G:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.ir.optimize.J:
     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():1014:1014 -> 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):216:216 -> a
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):211:211 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> 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:32:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
@@ -35969,157 +36471,136 @@
     35:35:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     35:35:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):64 -> a
     36:39:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):68:71 -> a
-    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
     40:40:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):72 -> a
     41:47:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):73:79 -> a
     48:48:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     48:48:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):77 -> a
-com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.ir.optimize.H:
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.function.Consumer splitBlockConsumer -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):54:57 -> <init>
-    boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:77:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):63:139 -> a
-    78:152:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):138:212 -> a
-    153:173:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):210:230 -> a
-    174:174:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    174:174:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):230 -> a
-    175:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):230:230 -> a
-    176:236:void addNonNullForValues(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.Instruction,java.util.Set,java.util.Set):255:315 -> a
-    237:255:void addNonNullForValues(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.Instruction,java.util.Set,java.util.Set):313:331 -> a
-    256:261: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):339:344 -> a
-    262:262:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    262:262: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):344 -> a
-    263: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):346:354 -> a
-    272:275:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):363:366 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.M:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.O:
     java.util.List candidateMethodLists -> a
-    java.util.Map outlineSites -> c
-    java.util.Map generatedOutlines -> d
-    com.android.tools.r8.graph.AppView appView -> e
-    com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsSelectedForOutlining -> b
-    java.util.function.Consumer outlineMethodIdentifierGenerator -> g
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> f
+    java.util.Map outlineSites -> b
+    java.util.Map generatedOutlines -> c
+    com.android.tools.r8.graph.AppView appView -> d
+    boolean $assertionsDisabled -> g
+    java.util.function.Consumer outlineMethodIdentifierGenerator -> f
+    com.android.tools.r8.ir.optimize.InliningConstraints inliningConstraints -> e
     1:1:void <clinit>():108:108 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):1270:1270 -> <init>
-    2:1163:void <init>(com.android.tools.r8.graph.AppView):111:1272 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):1269:1269 -> <init>
+    2:1162:void <init>(com.android.tools.r8.graph.AppView):111:1271 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):108:108 -> a
-    2:4:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1285:1287 -> a
-    5:5:com.android.tools.r8.utils.collections.ProgramMethodSet buildMethodsSelectedForOutlining():1324:1324 -> a
-    6:11:java.util.List selectOutlines():1390:1395 -> a
-    6:11:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1331 -> a
-    12:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1332:1340 -> a
-    21:21: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):584:584 -> a
-    21:21:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1341 -> a
-    22:29:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1342:1349 -> a
-    30:30:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    30:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1349 -> a
-    31:34:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1349:1352 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    35:35:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
-    36:68:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1385 -> a
-    69:75:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1402:1408 -> a
+    2:9:void lambda$createOutlineMethodIdentifierGenerator$0(java.util.Map,com.android.tools.r8.ir.code.IRCode):1284:1291 -> a
+    10:10:void lambda$selectMethodsForOutlining$1(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod,int):1319:1319 -> a
+    11:16:java.util.List selectOutlines():1389:1394 -> a
+    11:16:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1330 -> a
+    17:25:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1331:1339 -> a
+    26:26: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):582:582 -> a
+    26:26:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1340 -> a
+    27:34:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1341:1348 -> a
+    35:35:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    35:35:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1348 -> a
+    36:39:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1348:1351 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    40:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1351 -> a
+    41:73:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352:1384 -> a
+    74:80:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1401:1407 -> a
+    81:82:boolean checkAllOutlineSitesFoundAgain():1412:1413 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):108:108 -> b
-    2:9:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1300:1307 -> b
-    10:11:boolean checkAllOutlineSitesFoundAgain():1413:1414 -> b
+    2:5:void createOutlineMethodIdentifierGenerator():1279:1282 -> b
+    6:9:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1304:1307 -> b
+    10:13:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode):1306:1309 -> b
     1:1:java.util.List access$200(com.android.tools.r8.ir.optimize.Outliner):108:108 -> c
-    2:5:void createOutlineMethodIdentifierGenerator():1280:1283 -> c
+    2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1299:1300 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):108:108 -> d
-    2:3:java.util.function.Consumer getOutlineMethodIdentifierGenerator():1295:1296 -> d
+    2:10:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1314:1322 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):108:108 -> e
-    2:10:boolean selectMethodsForOutlining():1312:1320 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.I:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.ir.optimize.K:
     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):212:213 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):210:211 -> <init>
     java.lang.String getDetailsString() -> a
-    1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):217:217 -> a
-    2:21:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):140:159 -> a
-    2:21:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):218 -> a
-    22:22:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):219:219 -> a
-    23:23:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):161:161 -> a
-    23:23:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):218 -> a
-    24:24:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):238:238 -> a
-    25:25:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):188:188 -> a
-    25:25:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):239 -> a
-    26:31:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):241:246 -> a
-    32:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):271:275 -> a
-    37:37:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    37:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):277 -> a
-    38:40:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):279:279 -> a
-    43:43:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):282:282 -> a
-    44:44:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    44:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):284 -> a
-    45:64:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):284:303 -> a
-    65:65:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):300:300 -> a
-    66:66:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):297:297 -> a
-    67:67:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):294:294 -> a
-    68:68:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):291:291 -> a
-    69:86:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):288:305 -> a
-    1:1:java.lang.String getInstructionName():256:256 -> b
+    1:1:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):215:215 -> a
+    2:21:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):138:157 -> a
+    2:21:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):216 -> a
+    22:22:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):217:217 -> a
+    23:23:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType.fromInstruction(com.android.tools.r8.ir.code.Instruction):159:159 -> a
+    23:23:com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Binop):216 -> a
+    24:24:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):236:236 -> a
+    25:25:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):186:186 -> a
+    25:25:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):237 -> a
+    26:31:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):239:244 -> a
+    32:36:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):269:273 -> a
+    37:37:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    37:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):275 -> a
+    38:40:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):277:277 -> a
+    43:43:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):280:280 -> a
+    44:44:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    44:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):282 -> a
+    45:64:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):282:301 -> a
+    65:65:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):298:298 -> a
+    66:66:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):295:295 -> a
+    67:67:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):292:292 -> a
+    68:68:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):289:289 -> a
+    69:86:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):286:303 -> a
+    1:1:java.lang.String getInstructionName():254:254 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-    1:5:boolean equals(java.lang.Object):229:233 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():184:184 -> hashCode
-    1:1:int hashCode():224 -> hashCode
-    2:2:int hashCode():224:224 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.J:
+    1:5:boolean equals(java.lang.Object):227:231 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():182:182 -> hashCode
+    1:1:int hashCode():222 -> hashCode
+    2:2:int hashCode():222:222 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.ir.optimize.L:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
     boolean hasReceiver -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.DexMethod method -> c
-    1:1:void <clinit>():374:374 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.ir.code.ValueType[],com.android.tools.r8.graph.DexProto):387:393 -> <init>
-    1:11:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):397:407 -> a
-    12:12:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):433:433 -> a
-    13:13:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):188:188 -> a
-    13:13:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):434 -> a
-    14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):436:455 -> a
-    34:34:java.lang.String getDetailsString():461:461 -> a
-    35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):490:492 -> a
-    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):494 -> a
-    39:44:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):480:485 -> a
-    39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):496 -> a
-    45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):496:501 -> a
-    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):503 -> a
-    52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):503:506 -> a
-    56:56: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
-    56:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):506 -> a
-    57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):507:507 -> a
-    1:1:java.lang.String getInstructionName():466:466 -> b
-    1:1:boolean hasOutValue():471:471 -> c
-    1:1:int numberOfInputs():476:476 -> d
-    1:8:boolean equals(java.lang.Object):421:428 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():184:184 -> hashCode
-    1:1:int hashCode():412 -> hashCode
-    2:6:int hashCode():412:416 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.K:
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean,com.android.tools.r8.ir.code.ValueType[],com.android.tools.r8.graph.DexProto):385:391 -> <init>
+    1:11:com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction fromInstruction(com.android.tools.r8.ir.code.InvokeMethod):395:405 -> a
+    12:12:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):431:431 -> a
+    13:13:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):186:186 -> a
+    13:13:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):432 -> a
+    14:33:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):434:453 -> a
+    34:34:java.lang.String getDetailsString():459:459 -> a
+    35:37:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):488:490 -> a
+    38:38:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    38:38:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):492 -> a
+    39:44:com.android.tools.r8.ir.code.ValueTypeConstraint getArgumentConstraint(int):478:483 -> a
+    39:44:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):494 -> a
+    45:50:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):494:499 -> a
+    51:51:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    51:51:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):501 -> a
+    52:55:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):501:504 -> a
+    56:56: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):67:67 -> a
+    56:56:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):504 -> a
+    57:57:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):505:505 -> a
+    1:1:java.lang.String getInstructionName():464:464 -> b
+    1:1:boolean hasOutValue():469:469 -> c
+    1:1:int numberOfInputs():474:474 -> d
+    1:8:boolean equals(java.lang.Object):419:426 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():182:182 -> hashCode
+    1:1:int hashCode():410 -> hashCode
+    2:6:int hashCode():410:414 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.ir.optimize.M:
     com.android.tools.r8.graph.DexType clazz -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexType):314:315 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):335:335 -> a
-    2:2:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):188:188 -> a
-    2:2:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):336 -> a
-    3:4:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):338:339 -> a
-    5:5:java.lang.String getDetailsString():344:344 -> a
-    6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):364:365 -> a
-    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):367 -> a
-    9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):367:369 -> a
-    1:1:java.lang.String getInstructionName():349:349 -> b
+    1:2:void <init>(com.android.tools.r8.graph.DexType):312:313 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):333:333 -> a
+    2:2:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):186:186 -> a
+    2:2:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):334 -> a
+    3:4:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):336:337 -> a
+    5:5:java.lang.String getDetailsString():342:342 -> a
+    6:7:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):362:363 -> a
+    8:8:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    8:8:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):365 -> a
+    9:11:int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int):365:367 -> a
+    1:1:java.lang.String getInstructionName():347:347 -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-    1:5:boolean equals(java.lang.Object):320:324 -> equals
-    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():184:184 -> hashCode
-    1:1:int hashCode():330 -> hashCode
-    2:2:int hashCode():330:330 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.L:
+    1:5:boolean equals(java.lang.Object):318:322 -> equals
+    1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():182:182 -> hashCode
+    1:1:int hashCode():328 -> hashCode
+    2:2:int hashCode():328:328 -> hashCode
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.ir.optimize.N:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -36127,45 +36608,45 @@
     java.util.List templateInstructions -> c
     com.android.tools.r8.graph.DexType returnType -> d
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():534:534 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):551:551 -> <init>
-    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):538:565 -> <init>
-    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):559:559 -> <init>
-    1:5:com.android.tools.r8.graph.DexProto buildProto():575:579 -> a
-    1:1:int compareTo(java.lang.Object):534:534 -> compareTo
-    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):632:637 -> compareTo
-    2:7:int compareTo(java.lang.Object):534 -> compareTo
-    8:8:int argumentCount():571:571 -> compareTo
-    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):637 -> compareTo
-    8:8:int compareTo(java.lang.Object):534 -> compareTo
-    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):637:668 -> compareTo
-    9:40:int compareTo(java.lang.Object):534 -> compareTo
-    1:18:boolean equals(java.lang.Object):589:606 -> equals
-    1:6:int hashCode():614:619 -> hashCode
-    1:37:java.lang.String toString():675:711 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.M$a:
+    1:1:void <clinit>():532:532 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):549:549 -> <init>
+    2:29:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):536:563 -> <init>
+    30:30:void <init>(com.android.tools.r8.ir.optimize.Outliner,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,int,int):557:557 -> <init>
+    1:5:com.android.tools.r8.graph.DexProto buildProto():573:577 -> a
+    1:1:int compareTo(java.lang.Object):532:532 -> compareTo
+    2:7:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):630:635 -> compareTo
+    2:7:int compareTo(java.lang.Object):532 -> compareTo
+    8:8:int argumentCount():569:569 -> compareTo
+    8:8:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):635 -> compareTo
+    8:8:int compareTo(java.lang.Object):532 -> compareTo
+    9:40:int compareTo(com.android.tools.r8.ir.optimize.Outliner$Outline):635:666 -> compareTo
+    9:40:int compareTo(java.lang.Object):532 -> compareTo
+    1:18:boolean equals(java.lang.Object):587:604 -> equals
+    1:6:int hashCode():612:617 -> hashCode
+    1:37:java.lang.String toString():673:709 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.ir.optimize.O$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):1574:1575 -> <init>
-    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1601:1602 -> buildIR
-    1:1:boolean computeEquals(java.lang.Object):1627:1627 -> computeEquals
-    1:1:int computeHashCode():1622:1622 -> computeHashCode
-    1:1:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1612:1612 -> registerCodeReferences
-    1:1:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1617:1617 -> registerCodeReferencesForDesugaring
-    1:1:java.lang.String toString():1607:1607 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.O:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1573:1574 -> <init>
+    1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):1600:1601 -> buildIR
+    1:1:boolean computeEquals(java.lang.Object):1626:1626 -> computeEquals
+    1:1:int computeHashCode():1621:1621 -> computeHashCode
+    1:1:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):1611:1611 -> registerCodeReferences
+    1:1:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):1616:1616 -> registerCodeReferencesForDesugaring
+    1:1:java.lang.String toString():1606:1606 -> toString
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.ir.optimize.Q:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():125:125 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType):167:168 -> <init>
+    1:1:void <clinit>():123:123 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType):165:166 -> <init>
     int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction) -> a
     int createInstruction(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.optimize.Outliner$Outline,int) -> a
     java.lang.String getDetailsString() -> a
-    1:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Instruction):172:179 -> a
+    1:8:com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction fromInstruction(com.android.tools.r8.ir.code.Instruction):170:177 -> a
     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.N:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.ir.optimize.P:
     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
@@ -36174,72 +36655,72 @@
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType REM -> e
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType INVOKE -> f
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType NEW -> g
-    1:7:void <clinit>():131:137 -> <clinit>
-    8:8:void <clinit>():130:130 -> <clinit>
-    1:1:void <init>(java.lang.String,int):130:130 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.P:
+    1:7:void <clinit>():129:135 -> <clinit>
+    8:8:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(java.lang.String,int):128:128 -> <init>
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.ir.optimize.S:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
-    1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):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.Q:
+    1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1140:1142 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1147:1149 -> a
+    4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1153:1154 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.ir.optimize.T:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.optimize.Outliner this$0 -> u
     int argumentsMapIndex -> t
-    1:1:void <clinit>():1175:1175 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1186:1190 -> <init>
-    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1195:1254 -> a
-    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261:1263 -> a
+    1:1:void <clinit>():1174:1174 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.List):1185:1189 -> <init>
+    1:60:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1194:1253 -> a
+    61:63:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1260:1262 -> a
     64:65:int com.android.tools.r8.utils.ListUtils.firstIndexMatching(java.util.List,java.util.function.Predicate):20:21 -> a
     64:65:boolean com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):50 -> a
-    64:65:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1262 -> a
+    64:65:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261 -> a
     66:66:boolean com.android.tools.r8.utils.ListUtils.removeFirstMatch(java.util.List,java.util.function.Predicate):52:52 -> a
-    66:66:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1262 -> a
-    67:70:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1262:1265 -> a
-    71:71:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1264:1264 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.S:
+    66:66:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261 -> a
+    67:70:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1261:1264 -> a
+    71:71:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1263:1263 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.ir.optimize.U:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
-    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):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.T:
+    1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1161:1162 -> <init>
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1167:1169 -> a
+    4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1168:1168 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.ir.optimize.V:
     boolean $assertionsDisabled -> e
     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
     int argumentMapIndex -> c
-    1:1:void <clinit>():1419:1419 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1425:1425 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1423:1427 -> <init>
+    1:1:void <clinit>():1418:1418 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1424:1424 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline,com.android.tools.r8.graph.DexMethod):1422:1426 -> <init>
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,int) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:int instructionCount():1432:1432 -> a
-    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1463:1463 -> a
-    3:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1477:1488 -> a
-    15:15:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1494:1494 -> a
-    16:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1505:1509 -> a
-    21:21:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():571:571 -> a
-    21:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1509 -> a
-    22:31:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1509:1518 -> a
-    32:32:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1524:1524 -> a
-    33:33:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1530:1530 -> a
-    34:34:int getMoveExceptionRegister(int):1540:1540 -> a
+    1:1:int instructionCount():1431:1431 -> a
+    2:2:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):1462:1462 -> a
+    3:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):1476:1487 -> a
+    15:15:void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean):1493:1493 -> a
+    16:20:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1504:1508 -> a
+    21:21:int com.android.tools.r8.ir.optimize.Outliner$Outline.argumentCount():569:569 -> a
+    21:21:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1508 -> a
+    22:31:void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean):1508:1517 -> a
+    32:32:void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder):1523:1523 -> a
+    33:33:void resolveAndBuildNewArrayFilledData(int,int,com.android.tools.r8.ir.conversion.IRBuilder):1529:1529 -> a
+    34:34:int getMoveExceptionRegister(int):1539:1539 -> a
     void buildPostlude(com.android.tools.r8.ir.conversion.IRBuilder) -> b
     int instructionOffset(int) -> b
     void setUp() -> b
     com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder) -> c
     com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int) -> c
     boolean verifyCurrentInstructionCanThrow() -> c
-    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1545:1545 -> d
-    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1550:1550 -> d
+    1:1:com.android.tools.r8.ir.code.Position getCanonicalDebugPositionAtOffset(int):1544:1544 -> d
+    2:2:com.android.tools.r8.ir.code.Position getCurrentPosition():1549:1549 -> d
     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.U:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.ir.optimize.W:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -36256,51 +36737,51 @@
     java.util.List arguments -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.optimize.Outliner this$0 -> o
-    1:1:void <clinit>():719:719 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):738:738 -> <init>
-    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):724:741 -> <init>
+    1:1:void <clinit>():717:717 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):736:736 -> <init>
+    2:19:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):722:739 -> <init>
     void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline) -> a
-    1:4:java.util.List getInstructionArray():745:748 -> a
-    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):770:775 -> a
-    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):921:933 -> a
-    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):938:944 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944 -> a
-    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):947:953 -> a
-    39:70:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):959:990 -> a
-    71:78:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1072:1079 -> a
-    79:108:void candidate(int,int,int):1086:1115 -> a
-    109:119:void reset(int):1120:1130 -> a
-    1:1:void invalidateInstructionArray():753:753 -> b
-    1:5:void process():759:763 -> c
-    6:16:void processInstruction(com.android.tools.r8.ir.code.Instruction):786:796 -> c
-    6:16:void process():763 -> c
-    17:103:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):829:915 -> c
-    17:103:void processInstruction(com.android.tools.r8.ir.code.Instruction):803 -> c
-    17:103:void process():763 -> c
-    104:104:void processInstruction(com.android.tools.r8.ir.code.Instruction):807:807 -> c
-    104:104:void process():763 -> c
-    105:133:void includeInstruction(com.android.tools.r8.ir.code.Instruction):998:1026 -> c
-    105:133:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    105:133:void process():763 -> c
-    134:161:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1024:1051 -> c
-    134:161:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    134:161:void process():763 -> c
-    162:165:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1050:1053 -> c
-    162:165:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    162:165:void process():763 -> c
-    166:193:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1035:1062 -> c
-    166:193:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    166:193:void process():763 -> c
-    194:200:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1060:1066 -> c
-    194:200:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    194:200:void process():763 -> c
-    201:201:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1064:1064 -> c
-    201:201:void processInstruction(com.android.tools.r8.ir.code.Instruction):810 -> c
-    201:201:void process():763 -> c
-    202:212:void processInstruction(com.android.tools.r8.ir.code.Instruction):812:822 -> c
-    202:212:void process():763 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.V:
+    1:4:java.util.List getInstructionArray():743:746 -> a
+    5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):768:773 -> a
+    11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
+    24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
+    32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944:950 -> a
+    39:70:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):956:987 -> a
+    71:78:void updateReturnValueState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):1069:1076 -> a
+    79:108:void candidate(int,int,int):1083:1112 -> a
+    109:119:void reset(int):1117:1127 -> a
+    1:1:void invalidateInstructionArray():751:751 -> b
+    1:5:void process():757:761 -> c
+    6:16:void processInstruction(com.android.tools.r8.ir.code.Instruction):784:794 -> c
+    6:16:void process():761 -> c
+    17:102:boolean canIncludeInstruction(com.android.tools.r8.ir.code.Instruction):827:912 -> c
+    17:102:void processInstruction(com.android.tools.r8.ir.code.Instruction):801 -> c
+    17:102:void process():761 -> c
+    103:103:void processInstruction(com.android.tools.r8.ir.code.Instruction):805:805 -> c
+    103:103:void process():761 -> c
+    104:132:void includeInstruction(com.android.tools.r8.ir.code.Instruction):995:1023 -> c
+    104:132:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    104:132:void process():761 -> c
+    133:160:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1021:1048 -> c
+    133:160:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    133:160:void process():761 -> c
+    161:164:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1047:1050 -> c
+    161:164:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    161:164:void process():761 -> c
+    165:192:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1032:1059 -> c
+    165:192:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    165:192:void process():761 -> c
+    193:199:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1057:1063 -> c
+    193:199:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    193:199:void process():761 -> c
+    200:200:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1061:1061 -> c
+    200:200:void processInstruction(com.android.tools.r8.ir.code.Instruction):808 -> c
+    200:200:void process():761 -> c
+    201:211:void processInstruction(com.android.tools.r8.ir.code.Instruction):810:820 -> c
+    201:211:void process():761 -> c
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.ir.optimize.X:
     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
@@ -36354,7 +36835,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.W:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.ir.optimize.Y:
     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
@@ -36376,7 +36857,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.e0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.ir.optimize.g0:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState activeState -> f
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> d
@@ -36389,142 +36870,142 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:71 -> <init>
     2:14:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62:74 -> <init>
     1:1:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):52:52 -> a
-    2:2:boolean lambda$run$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):277:277 -> a
-    3:22:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):346:365 -> a
-    23:23:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):353:353 -> a
-    24:41:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):368:385 -> a
-    42:43:void killAllNonFinalActiveFields():391:392 -> a
-    44:64:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):396:416 -> a
+    2:2:boolean lambda$run$0(com.android.tools.r8.graph.DexType):276:276 -> a
+    3:22:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):345:364 -> a
+    23:23:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):352:352 -> a
+    24:41:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):367:384 -> a
+    42:43:void killAllNonFinalActiveFields():390:391 -> a
+    44:64:void killNonFinalActiveFields(com.android.tools.r8.ir.code.FieldInstruction):395:415 -> a
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):52:52 -> b
-    2:24:void run():164:186 -> b
-    25:29:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):154:158 -> b
-    25:29:void run():187 -> b
-    30:30:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> b
-    30:30:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):158 -> b
-    30:30:void run():187 -> b
-    31:48:void run():188:205 -> b
-    49:60:void run():204:215 -> b
-    61:61:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):147:147 -> b
-    61:61:void run():216 -> b
-    62:62:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> b
-    62:62:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):148 -> b
-    62:62:void run():216 -> b
-    63:63:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):150:150 -> b
-    63:63:void run():216 -> b
-    64:64:void run():217:217 -> b
-    65:70:boolean verifyWasInstanceInitializer():335:340 -> b
-    65:70:void run():218 -> b
-    71:74:boolean verifyWasInstanceInitializer():338:341 -> b
-    71:74:void run():218 -> b
-    75:91:void run():219:235 -> b
-    92:92:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):147:147 -> b
-    92:92:void run():236 -> b
-    93:93:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> b
-    93:93:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):148 -> b
-    93:93:void run():236 -> b
-    94:94:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):150:150 -> b
-    94:94:void run():236 -> b
-    95:105:void run():237:247 -> b
-    106:106:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> b
-    106:106:void run():248 -> b
-    107:110:void run():249:252 -> b
-    111:200:void run():189:278 -> b
-    201:242:void run():273:314 -> b
-    243:269:void run():289:315 -> b
-    270:270:void run() -> b
-    271:271:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():196:196 -> b
-    271:271:void run():318 -> b
-    272:282:void run():319:329 -> b
-    283:283:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    283:283:void run():329 -> b
-    284:286:void run():329:331 -> b
+    2:23:void run():164:185 -> b
+    24:28:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):154:158 -> b
+    24:28:void run():186 -> b
+    29:29:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> b
+    29:29:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):158 -> b
+    29:29:void run():186 -> b
+    30:47:void run():187:204 -> b
+    48:59:void run():203:214 -> b
+    60:60:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):147:147 -> b
+    60:60:void run():215 -> b
+    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> b
+    61:61:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):148 -> b
+    61:61:void run():215 -> b
+    62:62:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):150:150 -> b
+    62:62:void run():215 -> b
+    63:63:void run():216:216 -> b
+    64:69:boolean verifyWasInstanceInitializer():334:339 -> b
+    64:69:void run():217 -> b
+    70:73:boolean verifyWasInstanceInitializer():337:340 -> b
+    70:73:void run():217 -> b
+    74:90:void run():218:234 -> b
+    91:91:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):147:147 -> b
+    91:91:void run():235 -> b
+    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> b
+    92:92:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):148 -> b
+    92:92:void run():235 -> b
+    93:93:boolean isFinal(com.android.tools.r8.graph.DexEncodedField):150:150 -> b
+    93:93:void run():235 -> b
+    94:104:void run():236:246 -> b
+    105:105:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> b
+    105:105:void run():247 -> b
+    106:109:void run():248:251 -> b
+    110:199:void run():188:277 -> b
+    200:241:void run():272:313 -> b
+    242:268:void run():288:314 -> b
+    269:269:void run() -> b
+    270:270:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():196:196 -> b
+    270:270:void run():317 -> b
+    271:281:void run():318:328 -> b
+    282:282:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    282:282:void run():328 -> b
+    283:285:void run():328:330 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):52:52 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):52:52 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.X:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.ir.optimize.Y:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.ir.optimize.Z:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.ir.optimize.a0:
     java.util.LinkedHashMap finalInstanceFieldValues -> a
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> d
     java.util.LinkedHashMap nonFinalStaticFieldValues -> e
     java.util.LinkedHashMap finalStaticFieldValues -> b
     boolean $assertionsDisabled -> f
     java.util.LinkedHashSet initializedClasses -> c
-    1:1:void <clinit>():539:539 -> <clinit>
-    1:1:void <init>():551:551 -> <init>
-    2:23:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):553:574 -> <init>
-    1:1:void clearNonFinalInstanceFields():580:580 -> a
-    2:6:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getInstanceFieldValue(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):597:601 -> a
-    7:11:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getStaticFieldValue(com.android.tools.r8.graph.DexField):606:610 -> a
-    12:35:void intersect(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):614:637 -> a
-    36:36:void intersectFieldValues(java.util.Map,java.util.Map):643:643 -> a
-    37:37:boolean lambda$intersectFieldValues$0(java.util.Map,java.util.Map$Entry):643:643 -> a
-    38:38:void intersectInitializedClasses(java.util.Set,java.util.Set):648:648 -> a
-    39:39:boolean isClassInitialized(com.android.tools.r8.graph.DexType):652:652 -> a
-    40:40:boolean isEmpty(java.util.Map):668:668 -> a
-    41:44:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):675:678 -> a
-    45:46:void removeFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):733:734 -> a
-    45:46:void removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):728 -> a
-    45:46:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):679 -> a
-    47:48:void removeNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):739:740 -> a
-    47:48:void removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):729 -> a
-    47:48:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):679 -> a
-    49:49:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):680:680 -> a
-    50:51:void removeFinalStaticField(com.android.tools.r8.graph.DexField):756:757 -> a
-    50:51:void removeStaticField(com.android.tools.r8.graph.DexField):751 -> a
-    50:51:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):681 -> a
-    52:53:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):762:763 -> a
-    52:53:void removeStaticField(com.android.tools.r8.graph.DexField):752 -> a
-    52:53:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):681 -> a
-    54:55:void killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):686:687 -> a
-    54:55:void access$600(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState,com.android.tools.r8.ir.code.InitClass):539 -> a
-    56:63:void reduceSize(int):700:707 -> a
-    64:67:int reduceSize(int,java.util.Set):714:717 -> a
-    68:68:int reduceSize(int,java.util.Map):724:724 -> a
-    69:69:boolean lambda$removeNonFinalInstanceFields$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):746:746 -> a
-    70:74:void putFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):768:772 -> a
-    75:79:void putFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):776:780 -> a
-    1:1:void clearNonFinalStaticFields():584:584 -> b
-    2:6:void markClassAsInitialized(com.android.tools.r8.graph.DexType):692:696 -> b
-    7:8:void removeNonFinalInstanceFields(com.android.tools.r8.graph.DexField):745:746 -> b
-    9:14:void putNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):784:789 -> b
-    15:20:void putNonFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):793:798 -> b
-    21:21:int size(java.util.Map):814:814 -> b
-    1:4:void ensureCapacityForNewElement():588:591 -> c
-    5:6:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):762:763 -> c
-    1:2:boolean isEmpty():656:657 -> d
-    3:3:boolean isEmpty(java.util.Set):664:664 -> d
-    3:3:boolean isEmpty():658 -> d
-    4:6:boolean isEmpty():658:660 -> d
-    1:2:int size():802:803 -> e
-    3:3:int size(java.util.Set):810:810 -> e
-    3:3:int size():804 -> e
-    4:6:int size():804:806 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.ir.optimize.Z:
+    1:1:void <clinit>():538:538 -> <clinit>
+    1:1:void <init>():550:550 -> <init>
+    2:23:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):552:573 -> <init>
+    1:1:void clearNonFinalInstanceFields():579:579 -> a
+    2:6:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getInstanceFieldValue(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):596:600 -> a
+    7:11:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue getStaticFieldValue(com.android.tools.r8.graph.DexField):605:609 -> a
+    12:35:void intersect(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):613:636 -> a
+    36:36:void intersectFieldValues(java.util.Map,java.util.Map):642:642 -> a
+    37:37:boolean lambda$intersectFieldValues$0(java.util.Map,java.util.Map$Entry):642:642 -> a
+    38:38:void intersectInitializedClasses(java.util.Set,java.util.Set):647:647 -> a
+    39:39:boolean isClassInitialized(com.android.tools.r8.graph.DexType):651:651 -> a
+    40:40:boolean isEmpty(java.util.Map):667:667 -> a
+    41:44:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):674:677 -> a
+    45:46:void removeFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):732:733 -> a
+    45:46:void removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):727 -> a
+    45:46:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):678 -> a
+    47:48:void removeNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):738:739 -> a
+    47:48:void removeInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):728 -> a
+    47:48:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):678 -> a
+    49:49:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):679:679 -> a
+    50:51:void removeFinalStaticField(com.android.tools.r8.graph.DexField):755:756 -> a
+    50:51:void removeStaticField(com.android.tools.r8.graph.DexField):750 -> a
+    50:51:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):680 -> a
+    52:53:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):761:762 -> a
+    52:53:void removeStaticField(com.android.tools.r8.graph.DexField):751 -> a
+    52:53:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):680 -> a
+    54:55:void killActiveInitializedClassesForExceptionalExit(com.android.tools.r8.ir.code.InitClass):685:686 -> a
+    54:55:void access$600(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState,com.android.tools.r8.ir.code.InitClass):538 -> a
+    56:63:void reduceSize(int):699:706 -> a
+    64:67:int reduceSize(int,java.util.Set):713:716 -> a
+    68:68:int reduceSize(int,java.util.Map):723:723 -> a
+    69:69:boolean lambda$removeNonFinalInstanceFields$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):745:745 -> a
+    70:74:void putFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):767:771 -> a
+    75:79:void putFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):775:779 -> a
+    1:1:void clearNonFinalStaticFields():583:583 -> b
+    2:6:void markClassAsInitialized(com.android.tools.r8.graph.DexType):691:695 -> b
+    7:8:void removeNonFinalInstanceFields(com.android.tools.r8.graph.DexField):744:745 -> b
+    9:14:void putNonFinalInstanceField(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):783:788 -> b
+    15:20:void putNonFinalStaticField(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue):792:797 -> b
+    21:21:int size(java.util.Map):813:813 -> b
+    1:4:void ensureCapacityForNewElement():587:590 -> c
+    5:6:void removeNonFinalStaticField(com.android.tools.r8.graph.DexField):761:762 -> c
+    1:2:boolean isEmpty():655:656 -> d
+    3:3:boolean isEmpty(java.util.Set):663:663 -> d
+    3:3:boolean isEmpty():657 -> d
+    4:6:boolean isEmpty():657:659 -> d
+    1:2:int size():801:802 -> e
+    3:3:int size(java.util.Set):809:809 -> e
+    3:3:int size():803 -> e
+    4:6:int size():803:805 -> e
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.ir.optimize.b0:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():420:420 -> <clinit>
-    1:6:void <init>():420:425 -> <init>
-    1:11:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):491:501 -> a
-    12:13:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):509:510 -> a
-    14:39:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):461:486 -> a
-    14:39:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):513 -> a
-    40:42:int size():530:532 -> a
-    40:42:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):486 -> a
-    40:42:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):513 -> a
-    43:43:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):486:486 -> a
-    43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):513 -> a
-    44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):514:516 -> a
+    1:1:void <clinit>():419:419 -> <clinit>
+    1:6:void <init>():419:424 -> <init>
+    1:11:void removeDeadBlockExitStates(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):490:500 -> a
+    12:13:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):508:509 -> a
+    14:39:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):460:485 -> a
+    14:39:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):512 -> a
+    40:42:int size():529:531 -> a
+    40:42:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):485 -> a
+    40:42:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):512 -> a
+    43:43:void ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):485:485 -> a
+    43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):512 -> a
+    44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):513:515 -> a
     47:47:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():583:583 -> a
-    47:47:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):428 -> a
-    48:71:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):429:452 -> a
-    1:5:void removeState(com.android.tools.r8.ir.code.BasicBlock):520:524 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.ir.optimize.a0:
+    47:47:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):427 -> a
+    48:71:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):428:451 -> a
+    1:5:void removeState(com.android.tools.r8.ir.code.BasicBlock):519:523 -> b
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.ir.optimize.c0:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):87:87 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):91:92 -> <init>
     1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):97:100 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.b0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.ir.optimize.d0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -36534,9 +37015,9 @@
     1:1:com.android.tools.r8.graph.DexField access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):121:121 -> a
     1:5:boolean equals(java.lang.Object):138:142 -> equals
     1:1:int hashCode():133:133 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.ir.optimize.c0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.ir.optimize.e0:
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.ir.optimize.d0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.ir.optimize.f0:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -36545,99 +37026,76 @@
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):108:110 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):115:117 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):116:116 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.f0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.ir.optimize.h0:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:22:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):38:59 -> a
-    23:46: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):90:113 -> a
-    23:46:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    47:47: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):118 -> a
-    47:47:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    48:60: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):118:130 -> a
-    48:60:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
-    61:63:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:62 -> a
-    64:137: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):141:214 -> a
-    64:137:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):61 -> a
-    138:139:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:66 -> a
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:22:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:60 -> a
+    23:46:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):89:112 -> a
+    23:46:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
+    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    47:47:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):117 -> a
+    47:47:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
+    48:60:com.android.tools.r8.graph.DexType getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):117:129 -> a
+    48:60:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
+    61:63:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
+    64:137: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.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):140:213 -> a
+    64:137:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
+    138:139:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:67 -> a
     140:140:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):385:385 -> a
-    140:140:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66 -> a
-    141:144:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67:70 -> a
-    145:145:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    145:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):70 -> a
-    146:148:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:73 -> a
-    149:158:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:81 -> a
+    140:140:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
+    141:144:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:71 -> a
+    145:145:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    145:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71 -> a
+    146:148:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
+    149:158:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):73:82 -> a
     159:159:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    159:159:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81 -> a
-    160:162:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):81:83 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.h0:
+    159:159:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82 -> a
+    160:162:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82:84 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.ir.optimize.j0:
+    com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
-    java.util.concurrent.atomic.AtomicInteger atomicInteger -> c
-    com.android.tools.r8.graph.AppView appView -> d
-    boolean $assertionsDisabled -> e
     java.util.concurrent.atomic.AtomicReference synthesizedClass -> a
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):81:81 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView):73:82 -> <init>
-    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):80:80 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):74:81 -> <init>
+    1:1:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):89:89 -> a
     2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):91 -> a
-    3:70:void rewrite(com.android.tools.r8.ir.code.IRCode):92:159 -> a
-    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    71:71:void rewrite(com.android.tools.r8.ir.code.IRCode):159 -> a
-    72:82:void rewrite(com.android.tools.r8.ir.code.IRCode):163:173 -> a
-    83:94:void rewrite(com.android.tools.r8.ir.code.IRCode):172:183 -> a
-    95:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):188:195 -> a
-    95:102: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):175 -> a
-    103:115:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):192:204 -> a
-    103:115: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):175 -> a
-    116:124: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):46:54 -> a
-    116:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    116:124: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):175 -> a
-    125:140: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):51:66 -> a
-    125:140:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    125:140: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):175 -> a
-    141:141: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):64:64 -> a
-    141:141:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    141:141: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):175 -> a
-    142:164: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):57:79 -> a
-    142:164:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    142:164: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):175 -> a
-    165:165: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):76:76 -> a
-    165:165:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    165:165: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):175 -> a
-    166:192: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):72:98 -> a
-    166:192:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    166:192: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):175 -> a
-    193:193: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):96:96 -> a
-    193:193:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    193:193: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):175 -> a
-    194:219: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
-    194:219:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    194:219: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):175 -> a
-    220:220:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> a
-    220:220:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):204 -> a
-    220:220: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):175 -> a
-    221:221:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:206 -> a
-    221:221: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):175 -> a
-    222:222: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):176:176 -> a
-    223:223:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    223:223: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):176 -> a
-    224:224: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):177:177 -> a
-    225:258:com.android.tools.r8.graph.DexProgramClass getOrSetSynthesizedClass():211:244 -> a
-    259:277:com.android.tools.r8.graph.DexProgramClass lambda$getOrSetSynthesizedClass$1(com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.graph.DexProgramClass):222:240 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():86:86 -> b
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.g0:
+    2:2:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):90 -> a
+    3:70:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):91:158 -> a
+    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    71:71:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):158 -> a
+    72:82:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):162:172 -> a
+    83:95:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):171:183 -> a
+    96:108:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):189:201 -> a
+    96:108:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
+    109:121:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):198:210 -> a
+    109:121:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
+    122:122:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> a
+    122:122:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):210 -> a
+    122:122:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
+    123:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):212:213 -> a
+    123:124:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:176 -> a
+    126:126:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176 -> a
+    127:127:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):177:177 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):214:214 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):175 -> a
+    129:165:com.android.tools.r8.graph.DexProgramClass getOrSetSynthesizedClass():218:254 -> a
+    166:187:com.android.tools.r8.graph.DexProgramClass lambda$getOrSetSynthesizedClass$1(com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.graph.DexProgramClass):229:250 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():85:85 -> b
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.i0:
     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
-    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):278:281 -> <init>
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeStatic):288:291 -> <init>
     boolean lambda$perform$1(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):288:288 -> a
-    2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):304:307 -> a
-    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):287 -> a
-    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):288:300 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.i0:
+    1:1:boolean lambda$perform$0(com.android.tools.r8.ir.code.Instruction):298:298 -> a
+    2:5:void clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):314:317 -> a
+    2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):297 -> a
+    6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):298:310 -> a
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.ir.optimize.k0:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -36684,7 +37142,7 @@
     87:88:boolean optimize():89 -> d
     89:89:void replaceSwitchByGoto():136:136 -> d
     89:89:boolean optimize():89 -> d
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.j0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.ir.optimize.l0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -36696,90 +37154,74 @@
     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):216:216 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):216:216 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.k0:
-    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.ir.optimize.n0:
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> i
-    int numberOfInvokesWithNullReceiver -> f
-    int numberOfMonitorWithNullReceiver -> g
-    int numberOfArrayInstructionsWithNullArray -> d
-    int numberOfInvokesWithNullArgument -> e
-    int numberOfInstanceGetOrInstancePutWithNullReceiver -> c
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> b
-    1:48:void <clinit>():55:102 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):113:113 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.AppView):107:115 -> <init>
-    1:12:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):121:132 -> a
-    13:24:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131:142 -> a
-    25:25:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):123:123 -> a
-    26:26:void lambda$run$0(java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map,com.android.tools.r8.graph.DexProgramClass):134:134 -> a
-    27:37:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):154:164 -> a
-    38:141:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):161:264 -> a
-    142:145:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):199:202 -> a
-    146:163:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):201:218 -> a
-    164:164:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):216:216 -> a
-    165:188:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexEncodedMethod):234:257 -> a
-    189:189:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
-    190:190:boolean lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):247:247 -> a
-    191:212:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):266:287 -> a
-    213:220:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):286:293 -> a
-    221:221:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):291:291 -> a
-    222:222:java.util.Set lambda$processClass$4(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):287:287 -> a
-    223:228:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):302:307 -> a
-    229:229:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):306:306 -> a
-    230:230:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):304:304 -> a
-    231:235:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):332:336 -> a
-    236:251:void rewrite(com.android.tools.r8.ir.code.IRCode):340:355 -> a
-    252:258:boolean isThrowNullCandidate(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):409:415 -> a
-    252:258:void rewrite(com.android.tools.r8.ir.code.IRCode):354 -> a
-    259:259:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65:65 -> a
-    259:259:boolean isThrowNullCandidate(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):415 -> a
-    259:259:void rewrite(com.android.tools.r8.ir.code.IRCode):354 -> a
-    260:262:boolean isThrowNullCandidate(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):416:418 -> a
-    260:262:void rewrite(com.android.tools.r8.ir.code.IRCode):354 -> a
-    263:274:void rewrite(com.android.tools.r8.ir.code.IRCode):356:367 -> a
-    275:275:void rewrite(com.android.tools.r8.ir.code.IRCode):363:363 -> a
-    276:295:void rewrite(com.android.tools.r8.ir.code.IRCode):357:376 -> a
-    296:305:void rewrite(com.android.tools.r8.ir.code.IRCode):375:384 -> a
-    306:326:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set,java.util.Set):510:530 -> a
-    306:326:void rewrite(com.android.tools.r8.ir.code.IRCode):383 -> a
-    327:328:void rewrite(com.android.tools.r8.ir.code.IRCode):394:395 -> a
-    329:329:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> a
-    329:329:void rewrite(com.android.tools.r8.ir.code.IRCode):396 -> a
-    330:332:void rewrite(com.android.tools.r8.ir.code.IRCode):397:399 -> a
-    333:333:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    333:333:void rewrite(com.android.tools.r8.ir.code.IRCode):399 -> a
-    334:336:void rewrite(com.android.tools.r8.ir.code.IRCode):399:401 -> a
-    337:341:void logResults():428:432 -> a
-    342:349:void logResults():429:436 -> a
-    350:355:void logResults():433:438 -> a
-    356:359:void logResults():437:440 -> a
-    360:363:void logResults():439:442 -> a
-    364:364:void logResults():441:441 -> a
-    365:375:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):454:464 -> a
-    376:376:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65:65 -> a
-    376:376:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):465 -> a
-    377:405:void rewriteFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):465:493 -> a
-    406:414:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):541:549 -> a
-    415:417:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):548:550 -> a
-    1:15:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):313:327 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.k0$a:
+    com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
+    boolean $assertionsDisabled -> c
+    1:48:void <clinit>():52:99 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):103:104 -> <init>
+    1:12:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):110:121 -> a
+    13:24:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):120:131 -> a
+    25:25:com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense run(com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):112:112 -> a
+    26:26:void lambda$run$0(java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map,com.android.tools.r8.graph.DexProgramClass):123:123 -> a
+    27:37:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):143:153 -> a
+    38:141:void processClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.MethodPoolCollection,java.util.Map):150:253 -> a
+    142:145:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):188:191 -> a
+    146:163:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):190:207 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$1(java.util.Map,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):205:205 -> a
+    165:188:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexEncodedMethod):223:246 -> a
+    189:189:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
+    190:190:boolean lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):236:236 -> a
+    191:212:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):255:276 -> a
+    213:220:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):275:282 -> a
+    221:221:com.android.tools.r8.graph.DexEncodedMethod lambda$processClass$5(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):280:280 -> a
+    222:222:java.util.Set lambda$processClass$4(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):276:276 -> a
+    223:228:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):291:296 -> a
+    229:229:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):295:295 -> a
+    230:230:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):293:293 -> a
+    231:235:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):321:325 -> a
+    236:250:void rewrite(com.android.tools.r8.ir.code.IRCode):329:343 -> a
+    251:259:boolean isThrowNullCandidate(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):376:384 -> a
+    251:259:void rewrite(com.android.tools.r8.ir.code.IRCode):343 -> a
+    260:267:void rewrite(com.android.tools.r8.ir.code.IRCode):344:351 -> a
+    268:286:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set,java.util.Set):404:422 -> a
+    268:286:void rewrite(com.android.tools.r8.ir.code.IRCode):350 -> a
+    287:295:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):434:442 -> a
+    287:295:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set,java.util.Set):423 -> a
+    287:295:void rewrite(com.android.tools.r8.ir.code.IRCode):350 -> a
+    296:298:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set):441:443 -> a
+    296:298:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeDynamicTypeRemover,java.util.Set,java.util.Set):423 -> a
+    296:298:void rewrite(com.android.tools.r8.ir.code.IRCode):350 -> a
+    299:300:void rewrite(com.android.tools.r8.ir.code.IRCode):361:362 -> a
+    301:301:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> a
+    301:301:void rewrite(com.android.tools.r8.ir.code.IRCode):363 -> a
+    302:304:void rewrite(com.android.tools.r8.ir.code.IRCode):364:366 -> a
+    305:305:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    305:305:void rewrite(com.android.tools.r8.ir.code.IRCode):366 -> a
+    306:308:void rewrite(com.android.tools.r8.ir.code.IRCode):366:368 -> a
+    1:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):301:316 -> b
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.ir.optimize.m0:
+    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>():55:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):54:54 -> <init>
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.ir.optimize.n0$a:
     java.util.Map removedArgumentsInfoPerMethod -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():62:62 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):72:78 -> <init>
-    8:17:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):71:80 -> <init>
-    1:12:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):85:96 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.o0:
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):69:75 -> <init>
+    8:17:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):68:77 -> <init>
+    1:12:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):82:93 -> lookupPrototypeChanges
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.ir.optimize.r0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -36813,25 +37255,25 @@
     1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):219:226 -> b
     1:6:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):256:261 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):215:215 -> d
-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>():340:342 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):340:340 -> <init>
     1:1:java.util.BitSet getUsedArguments():345:345 -> a
     2:2:boolean register(int):350:350 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.n0:
+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):182:183 -> <init>
     1:11:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):192:202 -> a
     12:14:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):208:210 -> a
     15:15:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):209:209 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.o0$a:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.ir.optimize.r0$a:
     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):67:75 -> <init>
     1:6:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):81:86 -> 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
@@ -36852,7 +37294,7 @@
     26:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):171 -> a
     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.RewrittenPrototypeDescription$ArgumentInfoCollection):174:174 -> 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.RewrittenPrototypeDescription$ArgumentInfoCollection):173:173 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.q0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.ir.optimize.t0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -36863,7 +37305,7 @@
     50:52:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):224 -> a
     53:65:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):228:240 -> a
     66:77:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):236:247 -> a
-    78:78:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    78:78:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     78:78:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):248 -> a
     79:104:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):248:273 -> a
     105:105:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1187:1187 -> a
@@ -36872,10 +37314,10 @@
     108:108:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     108:108:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):276 -> a
     109:129:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):276:296 -> a
-    130:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954:954 -> a
-    130:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2386 -> a
+    130:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965:965 -> a
+    130:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2410 -> a
     130:130:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):298 -> a
-    131:131:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2387:2387 -> a
+    131:131:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2411:2411 -> a
     131:131:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):298 -> a
     132:137:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):301:306 -> a
     138:138:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):180:180 -> a
@@ -36885,11 +37327,11 @@
     141:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):329:349 -> a
     141:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):314 -> a
     141:161:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):199 -> a
-    162:162:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):668:668 -> a
+    162:162:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):673:673 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):354 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):314 -> a
     162:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):199 -> a
-    163:163:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):667:667 -> a
+    163:163:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):672:672 -> a
     163:163:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):354 -> a
     163:163:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):314 -> a
     163:163:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):199 -> a
@@ -36901,7 +37343,7 @@
     167:167:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):199 -> a
     168:169:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):315:316 -> a
     168:169:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):199 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.q0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.ir.optimize.t0.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
@@ -36921,7 +37363,7 @@
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> q
     1:22:void <clinit>():45:66 -> <clinit>
     1:1:void <init>(java.lang.String,int):43:43 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.q0.c:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.ir.optimize.t0.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set definiteReceiverAliases -> c
     boolean $assertionsDisabled -> e
@@ -36940,12 +37382,12 @@
     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.q0.d:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.ir.optimize.t0.d:
     java.util.List callsReceiver -> a
     com.android.tools.r8.utils.OptionalBool returnsReceiver -> b
     boolean hasMonitorOnReceiver -> c
     1:4:void <init>(java.util.List,com.android.tools.r8.utils.OptionalBool,boolean):29:32 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.q0.e:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.ir.optimize.t0.e:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.Value receiver -> d
     boolean $assertionsDisabled -> f
@@ -36963,7 +37405,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.q0.f:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.ir.optimize.t0.f:
     java.util.Set maybeReceiverAliases -> c
     java.util.Set illegalReceiverAliases -> d
     boolean $assertionsDisabled -> f
@@ -36992,7 +37434,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.q0.g:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.ir.optimize.t0.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
@@ -37015,7 +37457,7 @@
     82:85:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.q0.i:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.t0.j:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.ProgramMethod method -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -37035,164 +37477,190 @@
     java.util.Map methodCallsOnInstance -> j
     java.util.Map extraMethodCalls -> l
     java.util.List unusedArguments -> m
-    1:11:void <clinit>():77:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):122:122 -> <init>
-    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):100:130 -> <init>
-    1:1:java.util.Map getDirectInlinees():138:138 -> a
-    2:2:boolean lambda$isInstanceEligible$0(com.android.tools.r8.graph.DexType):165:165 -> a
-    3:32:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):216:245 -> a
-    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    33:33:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):246 -> a
-    34:43:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):252:261 -> a
-    44:44:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    44:44:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262 -> a
-    45:48:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):268:271 -> a
-    49:55:boolean isEligibleLibraryMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1081 -> a
-    49:55:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):276 -> a
-    56:68:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:292 -> a
-    69:95:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):717:743 -> a
-    69:95:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    96:96:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():56:56 -> a
-    96:96:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):744 -> a
-    96:96:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    97:102:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):749:754 -> a
-    97:102:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    103:103:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):754 -> a
-    103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    104:116:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):754:766 -> a
-    104:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    117:127:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):762:772 -> a
-    117:127:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):294 -> a
-    128:152:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):296:320 -> a
-    153:176:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1029:1052 -> a
-    153:176:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):321 -> a
-    177:196:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1051:1070 -> a
-    177:196:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):321 -> a
-    197:200:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):330:333 -> a
-    201:201:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):362:362 -> a
-    202:208:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):400:406 -> a
-    202:208:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):363 -> a
-    209:209:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> a
-    209:209:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):406 -> a
-    209:209:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):363 -> a
-    210:215:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):407:412 -> a
-    210:215:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):363 -> a
-    216:220:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):417:421 -> a
-    216:220:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):365 -> a
-    221:225:void clear():392:396 -> a
-    221:225:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):368 -> a
-    226:233:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):371:378 -> a
-    234:242:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):373:381 -> a
-    243:265:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):489:511 -> a
-    243:265:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):382 -> a
-    266:266:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    266:266:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):511 -> a
-    266:266:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):382 -> a
-    267:276:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):512:521 -> a
-    267:276:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):382 -> a
-    277:277:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):518:518 -> a
-    277:277:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):382 -> a
-    278:307:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):500:529 -> a
-    278:307:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):382 -> a
-    308:308:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):383:383 -> a
-    309:332:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):558:581 -> a
-    309:332:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):384 -> a
-    333:386:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):580:633 -> a
-    333:386:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):384 -> a
-    387:387:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):385:385 -> a
-    388:406:void removeFieldWrites():694:712 -> a
-    388:406:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    407:409:void removeFieldWrites():706:708 -> a
-    407:409:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    410:412:void removeFieldWrites():696:698 -> a
-    410:412:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):386 -> a
-    413:413:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):387:387 -> a
-    414:420:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):427:433 -> a
-    421:450:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):431:460 -> a
-    451:451:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    451:451:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):460 -> a
-    452:457:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):461:466 -> a
-    458:470:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):462:474 -> a
-    471:471:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473:473 -> a
-    472:472:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):467:467 -> a
-    473:497:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):457:481 -> a
-    498:526:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):639:667 -> a
-    527:527:int lambda$removeFieldReads$1(com.android.tools.r8.ir.code.InstanceGet):640:640 -> a
-    528:532:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):673:677 -> a
-    533:544:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):676:687 -> a
-    545:545:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    545:545:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):687 -> a
-    546:546:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):688:688 -> a
-    547:547:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    547:547:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):688 -> a
-    548:551:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):687:690 -> a
-    552:552:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):677:677 -> a
-    553:601:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):786:834 -> a
-    553:601:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    602:602:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    602:602:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):834 -> a
-    602:602:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    603:605:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):837:839 -> a
-    603:605:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    606:606:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    606:606:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):839 -> a
-    606:606:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    607:607:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):843:843 -> a
-    607:607:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    608:621:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):815:828 -> a
-    608:621:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):884 -> a
-    622:636:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):860:874 -> a
-    637:645:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):873:881 -> a
-    646:676:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):879:909 -> a
-    677:683:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):922:928 -> a
-    684:684:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):933:933 -> a
-    685:728:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):941:984 -> a
-    729:741:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):989:1001 -> a
-    742:754:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):1092:1104 -> a
-    755:796:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1117:1158 -> a
-    797:800:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1197:1200 -> a
-    797:800:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1159 -> a
-    801:801:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    801:801:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1200 -> a
-    801:801:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1159 -> a
-    802:803:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1205:1206 -> a
-    802:803:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1159 -> a
-    804:806:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):913:915 -> a
-    804:806:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1155 -> a
-    807:810:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):914:917 -> a
-    807:810:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1155 -> a
-    811:830:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1169:1188 -> a
-    831:831:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1183:1183 -> a
-    832:832:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1215:1215 -> a
-    833:834:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1210:1211 -> a
-    833:834:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1216 -> a
-    835:837:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1218:1220 -> a
-    838:847:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1229:1238 -> a
-    848:848:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1234:1234 -> a
-    849:849:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1252:1252 -> a
-    850:851:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1252:1253 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():134:134 -> b
-    2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1105:1105 -> b
-    1:1:java.util.List getIndirectInlinees():142:142 -> c
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():146:146 -> d
-    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():205:205 -> e
-    1:7:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():152:158 -> f
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> f
-    8:8:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():158 -> f
-    9:17:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():158:166 -> f
-    18:42:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():162:186 -> f
-    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> f
-    43:43:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():186 -> f
-    44:48:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():186:190 -> f
-    49:49:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():183:183 -> f
-    1:6:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():534:539 -> g
+    1:11:void <clinit>():80:90 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):125:125 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):103:133 -> <init>
+    1:1:java.util.Map getDirectInlinees():141:141 -> a
+    2:2:boolean lambda$isInstanceEligible$0(com.android.tools.r8.graph.DexType):168:168 -> a
+    3:42:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):219:258 -> a
+    43:43:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    43:43:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):259 -> a
+    44:56:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):265:277 -> a
+    57:57:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):278 -> a
+    58:70:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):284:296 -> a
+    71:77:boolean isEligibleLibraryMethodCall(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1124:1130 -> a
+    71:77:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):301 -> a
+    78:90:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):305:317 -> a
+    91:117:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):753:779 -> a
+    91:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    118:118:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.receiverMayEscapeOutsideConstructorChain():56:56 -> a
+    118:118:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):780 -> a
+    118:118:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    119:124:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):785:790 -> a
+    119:124:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    125:125:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    125:125:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):790 -> a
+    125:125:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    126:138:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):790:802 -> a
+    126:138:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    139:149:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod):798:808 -> a
+    139:149:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):319 -> a
+    150:174:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):321:345 -> a
+    175:198:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1078:1101 -> a
+    175:198:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):346 -> a
+    199:218:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):1100:1119 -> a
+    199:218:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):346 -> a
+    219:222:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):355:358 -> a
+    223:240:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):228:245 -> a
+    241:241:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):387:387 -> a
+    242:248:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):425:431 -> a
+    242:248:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):388 -> a
+    249:249:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):30:30 -> a
+    249:249:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):431 -> a
+    249:249:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):388 -> a
+    250:255:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):432:437 -> a
+    250:255:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):388 -> a
+    256:261:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):442:447 -> a
+    256:261:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    262:262:boolean forceInlineExtraMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):446:446 -> a
+    262:262:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):390 -> a
+    263:267:void clear():417:421 -> a
+    263:267:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):393 -> a
+    268:275:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):396:403 -> a
+    276:284:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):398:406 -> a
+    285:307:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):517:539 -> a
+    285:307:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    308:308:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    308:308:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):539 -> a
+    308:308:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    309:315:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):540:546 -> a
+    309:315:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    316:316:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):98:98 -> a
+    316:316:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):547 -> a
+    316:316:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    317:317:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.code.InvokeMethodWithReceiver.lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):97:97 -> a
+    317:317:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):547 -> a
+    317:317:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    318:322:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):549:553 -> a
+    318:322:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    323:323:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):550:550 -> a
+    323:323:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    324:358:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):528:562 -> a
+    324:358:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    359:359:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):561:561 -> a
+    359:359:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):407 -> a
+    360:360:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):408:408 -> a
+    361:384:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):591:614 -> a
+    361:384:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):409 -> a
+    385:438:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):613:666 -> a
+    385:438:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):409 -> a
+    439:439:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):410:410 -> a
+    440:461:void removeFieldWrites():727:748 -> a
+    440:461:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):411 -> a
+    462:464:void removeFieldWrites():742:744 -> a
+    462:464:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):411 -> a
+    465:467:void removeFieldWrites():729:731 -> a
+    465:467:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):411 -> a
+    468:468:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):412:412 -> a
+    469:475:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):453:459 -> a
+    476:481:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):457:462 -> a
+    482:508:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):461:487 -> a
+    509:509:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    509:509:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):487 -> a
+    510:515:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):488:493 -> a
+    516:528:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):489:501 -> a
+    529:529:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):500:500 -> a
+    530:530:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):494:494 -> a
+    531:554:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):484:507 -> a
+    555:558:boolean forceInlineDirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):506:509 -> a
+    559:587:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):672:700 -> a
+    588:588:int lambda$removeFieldReads$1(com.android.tools.r8.ir.code.InstanceGet):673:673 -> a
+    589:593:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):706:710 -> a
+    594:605:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):709:720 -> a
+    606:606:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    606:606:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):720 -> a
+    607:607:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):721:721 -> a
+    608:608:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    608:608:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):721 -> a
+    609:612:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):720:723 -> a
+    613:613:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$2(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):710:710 -> a
+    614:662:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):822:870 -> a
+    614:662:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    663:663:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    663:663:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):870 -> a
+    663:663:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    664:666:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):873:875 -> a
+    664:666:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    667:667:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    667:667:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):875 -> a
+    667:667:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    668:668:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):879:879 -> a
+    668:668:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    669:682:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):851:864 -> a
+    669:682:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):924 -> a
+    683:701:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):897:915 -> a
+    702:717:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):910:925 -> a
+    718:754:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleDirectVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.function.Supplier):920:956 -> a
+    755:761:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):969:975 -> a
+    762:762:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo):979:979 -> a
+    763:807:boolean isEligibleVirtualMethodCall(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate,com.android.tools.r8.ir.code.Invoke$Type):989:1033 -> a
+    808:820:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):1038:1050 -> a
+    821:833:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):1141:1153 -> a
+    834:875:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1166:1207 -> a
+    876:879:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1250:1253 -> a
+    876:879:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1208 -> a
+    880:880:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    880:880:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1253 -> a
+    880:880:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1208 -> a
+    881:882:boolean isInstanceInitializerEligibleForClassInlining(com.android.tools.r8.graph.DexMethod):1258:1259 -> a
+    881:882:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1208 -> a
+    883:885:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):960:962 -> a
+    883:885:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1204 -> a
+    886:889:boolean isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):961:964 -> a
+    886:889:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1204 -> a
+    890:914:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1217:1241 -> a
+    915:915:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1235:1235 -> a
+    916:916:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1268:1268 -> a
+    917:918:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1263:1264 -> a
+    917:918:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1269 -> a
+    919:921:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1271:1273 -> a
+    922:931:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1282:1291 -> a
+    932:932:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1287:1287 -> a
+    933:933:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1305:1305 -> a
+    934:935:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1305:1306 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():137:137 -> b
+    2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1154:1154 -> b
+    1:1:java.util.List getIndirectInlinees():145:145 -> c
+    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():149:149 -> d
+    1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():208:208 -> e
+    1:7:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():155:161 -> f
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> f
+    8:8:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():161 -> f
+    9:17:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():161:169 -> f
+    18:31:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():165:178 -> f
+    32:32:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142:142 -> f
+    32:32:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():178 -> f
+    33:33:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:148 -> f
+    33:33:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> f
+    33:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():178 -> f
+    34:44:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():179:189 -> f
+    45:45:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> f
+    45:45:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():189 -> f
+    46:50:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():189:193 -> f
+    51:51:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():186:186 -> f
+    1:6:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():567:572 -> g
     7:7:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> g
-    7:7:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():539 -> g
-    8:21:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():539:552 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.q0.h:
-    1:1:void <init>():1256:1256 -> <init>
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.ir.optimize.r0.a:
+    7:7:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():572 -> g
+    8:21:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():572:585 -> g
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.ir.optimize.t0.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>():83:84 -> <clinit>
+    1:1:void <init>(java.lang.String,int):82:82 -> <init>
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.ir.optimize.t0.i:
+    1:1:void <init>():1309:1309 -> <init>
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.ir.optimize.u0.a:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -37200,7 +37668,7 @@
     1:1:com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer getInstance():20:20 -> a
     2:15:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):24:37 -> a
     1:12:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,int):41:52 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.ir.optimize.s0.f:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.ir.optimize.v0.f:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Map enumsUnboxingCandidates -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -37208,173 +37676,178 @@
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> d
     boolean $assertionsDisabled -> g
     java.util.Map debugLogs -> f
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:12:void <init>(com.android.tools.r8.graph.AppView):84:95 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):71:71 -> a
-    2:4:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason,com.android.tools.r8.graph.DexProgramClass):99:101 -> a
-    5:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):105:112 -> a
-    13:16:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):119:122 -> a
-    17:43:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):126:152 -> a
-    44:53:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):225:234 -> a
-    44:53:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):152 -> a
-    54:62:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):233:241 -> a
-    54:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):152 -> a
-    63:68:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):240:245 -> a
-    63:68:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):152 -> a
-    69:70:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):153:154 -> a
-    71:71:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):204:204 -> a
-    71:71:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):154 -> a
-    72:74:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):216:218 -> a
-    72:74:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):208 -> a
-    72:74:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):154 -> a
-    75:75:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):217:217 -> a
-    75:75:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):208 -> a
-    75:75:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):154 -> a
-    76:79:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):209:212 -> a
-    76:79:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):154 -> a
-    80:117:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):155:192 -> a
-    118:141:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):249:272 -> a
-    142:142:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):279:279 -> a
-    143:158:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):387:402 -> a
-    143:158:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    159:159:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    159:159:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):402 -> a
-    159:159:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    160:206:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):404:450 -> a
-    160:206:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    207:209:boolean isFirstInstructionAfterArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):557:559 -> a
-    207:209:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):451 -> a
-    207:209:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    210:257:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):452:499 -> a
-    210:257:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    258:260:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):216:218 -> a
-    258:260:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):499 -> a
-    258:260:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    261:261:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):217:217 -> a
-    261:261:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):499 -> a
-    261:261:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    262:315:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):500:553 -> a
-    262:315:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):280 -> a
-    316:329:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):281:294 -> a
-    330:342:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):304:316 -> a
-    343:381:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):313:351 -> a
-    382:383:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):588:589 -> a
-    384:385:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):605:606 -> a
-    386:388:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():613:615 -> a
+    1:1:void <clinit>():75:75 -> <clinit>
+    1:12:void <init>(com.android.tools.r8.graph.AppView):88:99 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):75:75 -> a
+    2:4:void markEnumAsUnboxable(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason,com.android.tools.r8.graph.DexProgramClass):103:105 -> a
+    5:12:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):109:116 -> a
+    13:16:com.android.tools.r8.graph.DexProgramClass getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):123:126 -> a
+    17:50:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):130:163 -> a
+    51:54:void analyzeInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set):212:215 -> a
+    51:54:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):163 -> a
+    55:55:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):169:169 -> a
+    56:62:void analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):200:206 -> a
+    56:62:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):169 -> a
+    63:63:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):157:157 -> a
+    64:73:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):246:255 -> a
+    64:73:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):157 -> a
+    74:82:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):254:262 -> a
+    74:82:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):157 -> a
+    83:88:void analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):261:266 -> a
+    83:88:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):157 -> a
+    89:89:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):160:160 -> a
+    90:90:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):225:225 -> a
+    90:90:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):160 -> a
+    91:93:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):237:239 -> a
+    91:93:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):229 -> a
+    91:93:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):160 -> a
+    94:94:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):238:238 -> a
+    94:94:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):229 -> a
+    94:94:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):160 -> a
+    95:98:void analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):230:233 -> a
+    95:98:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):160 -> a
+    99:118:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):174:193 -> a
+    119:142:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):270:293 -> a
+    143:143:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):300:300 -> a
+    144:159:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):404:419 -> a
+    144:159:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    160:160:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    160:160:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):419 -> a
+    160:160:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    161:203:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):421:463 -> a
+    161:203:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    204:206:boolean isFirstInstructionAfterArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):571:573 -> a
+    204:206:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):464 -> a
+    204:206:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    207:255:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):465:513 -> a
+    207:255:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    256:258:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):237:239 -> a
+    256:258:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):513 -> a
+    256:258:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    259:259:boolean allowCheckCast(com.android.tools.r8.ir.code.CheckCast):238:238 -> a
+    259:259:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):513 -> a
+    259:259:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    260:313:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):514:567 -> a
+    260:313:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):301 -> a
+    314:327:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):302:315 -> a
+    328:338:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):324:334 -> a
+    339:374:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):333:368 -> a
+    375:376:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):602:603 -> a
+    377:378:void synthesizeUtilityMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):619:620 -> a
+    379:381:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():626:628 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory access$300(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):71:71 -> b
-    2:5:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):596:599 -> b
-    1:24:void finishAnalysis():355:378 -> c
-    25:32:void reportEnumsAnalysis():567:574 -> c
-    25:32:void finishAnalysis():379 -> c
-    33:48:void reportEnumsAnalysis():569:584 -> c
-    33:48:void finishAnalysis():379 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.ir.optimize.s0.a:
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter access$300(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):75:75 -> b
+    2:5:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):610:613 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory access$400(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):75:75 -> c
+    2:25:void finishAnalysis():372:395 -> c
+    26:33:void reportEnumsAnalysis():581:588 -> c
+    26:33:void finishAnalysis():396 -> c
+    34:49:void reportEnumsAnalysis():583:598 -> c
+    34:49:void finishAnalysis():396 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.ir.optimize.v0.a:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():321:321 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):321:321 -> <init>
-    1:8:void fixup(com.android.tools.r8.graph.DexEncodedField):324:331 -> a
-    9:17:void fixup(com.android.tools.r8.graph.DexEncodedMethod):337:345 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens -> com.android.tools.r8.ir.optimize.s0.c:
+    1:1:void <clinit>():339:339 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):339:339 -> <init>
+    1:8:void fixup(com.android.tools.r8.graph.DexEncodedField):342:349 -> a
+    9:17:void fixup(com.android.tools.r8.graph.DexEncodedMethod):355:363 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens -> com.android.tools.r8.ir.optimize.v0.c:
     java.util.Map prototypeChanges -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():784:784 -> <clinit>
-    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):797:805 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder builder():818:818 -> b
-    1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):813:814 -> lookupPrototypeChanges
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder -> com.android.tools.r8.ir.optimize.s0.b:
+    1:1:void <clinit>():819:819 -> <clinit>
+    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):832:840 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder builder():853:853 -> b
+    1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):848:849 -> lookupPrototypeChanges
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder -> com.android.tools.r8.ir.optimize.v0.b:
     java.util.Map prototypeChanges -> f
-    1:3:void <init>():821:823 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1):821:821 -> <init>
-    1:16:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):827:842 -> a
-    17:17:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):841:841 -> a
-    18:29:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):847:858 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.ir.optimize.s0.d:
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INFO_MAP -> z
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason NAME_INVOKE -> x
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason COMPARE_TO_INVOKE -> v
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUE_OF_INVOKE -> t
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE_ON_ARRAY -> r
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_CLINIT -> p
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason NO_INIT -> n
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason CONST_CLASS -> l
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VIRTUAL_METHOD -> j
+    1:3:void <init>():856:858 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1):856:856 -> <init>
+    1:16:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):862:877 -> a
+    17:17:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):876:876 -> a
+    18:29:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLense):882:893 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.ir.optimize.v0.d:
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_PUT -> z
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> x
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUES_INVOKE -> v
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason IMPLICIT_UP_CAST_IN_RETURN -> t
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE -> r
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INIT -> p
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_PHI -> n
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNEXPECTED_DIRECT_METHOD -> l
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNRESOLVABLE_FIELD -> j
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason GENERIC_INVOKE -> h
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> G
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason OTHER_UNSUPPORTED_INSTRUCTION -> G
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INTERFACE -> f
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_IF_TYPES -> E
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DYNAMIC_TYPE -> E
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DOWN_CAST -> d
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason FIELD_PUT_ON_ENUM -> C
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason TYPE_MISMATCH_FIELD_PUT -> C
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ANNOTATION -> b
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_PUT -> A
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> y
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason TO_STRING_INVOKE -> w
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUES_INVOKE -> u
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason IMPLICIT_UP_CAST_IN_RETURN -> s
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE -> q
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INIT -> o
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_PHI -> m
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNEXPECTED_DIRECT_METHOD -> k
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_ARRAY_PUT -> A
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INFO_MAP -> y
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason COMPARE_TO_INVOKE -> w
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUE_OF_INVOKE -> u
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_INVOKE_ON_ARRAY -> s
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_CLINIT -> q
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason NO_INIT -> o
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason CONST_CLASS -> m
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VIRTUAL_METHOD -> k
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNEXPECTED_STATIC_FIELD -> i
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason OTHER_UNSUPPORTED_INSTRUCTION -> H
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INSTANCE_FIELD -> g
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason DYNAMIC_TYPE -> F
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ENUM_METHOD_CALLED_WITH_NULL_RECEIVER -> F
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason SUBTYPES -> e
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason TYPE_MISMATCH_FIELD_PUT -> D
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_IF_TYPES -> D
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason PINNED -> c
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_ARRAY_PUT -> B
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason FIELD_PUT_ON_ENUM -> B
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ELIGIBLE -> a
-    1:34:void <clinit>():627:660 -> <clinit>
-    1:1:void <init>(java.lang.String,int):626:626 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$TreeFixer -> com.android.tools.r8.ir.optimize.s0.e:
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> c
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder lensBuilder -> a
-    java.util.Set enumsToUnbox -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():663:663 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1):663:663 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set):668:668 -> <init>
-    3:7:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set):665:669 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense$NestedGraphLense access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$TreeFixer):663:663 -> a
-    2:29:com.android.tools.r8.graph.GraphLense$NestedGraphLense fixupTypeReferences():674:701 -> a
-    30:30:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):711:711 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    31:31:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):711 -> a
-    32:34:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):712:714 -> a
-    35:35:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):710:710 -> a
-    36:44:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):730:738 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
-    45:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):739 -> a
-    46:48:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):739:741 -> a
-    49:59:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):759:769 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718:718 -> b
-    2:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):749:749 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718 -> b
-    3:4:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):753:754 -> b
-    3:4:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):749 -> b
-    3:4:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718 -> b
-    5:7:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):776:778 -> b
-    5:7:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):754 -> b
-    5:7:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):749 -> b
-    5:7:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718 -> b
-    8:8:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):755:755 -> b
-    8:8:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):749 -> b
-    8:8:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718 -> b
-    9:9:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):749:749 -> b
-    9:9:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):718 -> b
-    10:12:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):719:721 -> b
-    1:1:void lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexEncodedMethod):684:684 -> c
-    2:2:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):711:711 -> c
-    2:2:void lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexEncodedMethod):685 -> c
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> c
-    3:3:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):711 -> c
-    3:3:void lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexEncodedMethod):685 -> c
-    4:6:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):712:714 -> c
-    4:6:void lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexEncodedMethod):685 -> c
-    7:7:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):710:710 -> c
-    7:7:void lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexEncodedMethod):685 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.ir.optimize.s0.g:
+    1:33:void <clinit>():640:672 -> <clinit>
+    1:1:void <init>(java.lang.String,int):639:639 -> <init>
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$TreeFixer -> com.android.tools.r8.ir.optimize.v0.e:
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumUnboxingLens$Builder lensBuilder -> b
+    java.util.List unboxedEnumsMethods -> a
+    java.util.Set enumsToUnbox -> c
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> d
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():675:675 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1):675:675 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set):681:681 -> <init>
+    3:8:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,java.util.Set):677:682 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense$NestedGraphLense access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer$TreeFixer):675:675 -> a
+    2:36:com.android.tools.r8.graph.GraphLense$NestedGraphLense fixupTypeReferences():686:720 -> a
+    37:37:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):697:697 -> a
+    38:38:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):730:730 -> a
+    38:38:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):698 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    39:39:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):730 -> a
+    39:39:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):698 -> a
+    40:42:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):731:733 -> a
+    40:42:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):698 -> a
+    43:43:void clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):729:729 -> a
+    43:43:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):698 -> a
+    44:46:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):700:702 -> a
+    47:50:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):738:741 -> a
+    47:50:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):702 -> a
+    51:56:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):740:745 -> a
+    51:56:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):702 -> a
+    57:59:void lambda$fixupTypeReferences$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):701:703 -> a
+    60:60:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):749:749 -> a
+    61:61:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):780:780 -> a
+    61:61:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):749 -> a
+    62:64:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):750:752 -> a
+    65:73:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):761:769 -> a
+    74:74:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
+    74:74:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):770 -> a
+    75:77:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):770:772 -> a
+    78:78:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):784:784 -> a
+    79:80:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):788:789 -> a
+    79:80:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):784 -> a
+    81:83:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):811:813 -> a
+    81:83:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):789 -> a
+    81:83:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):784 -> a
+    84:84:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):790:790 -> a
+    84:84:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):784 -> a
+    85:85:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):784:784 -> a
+    86:96:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):794:804 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.ir.optimize.v0.g:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map enumToUnboxCandidates -> d
@@ -37386,169 +37859,190 @@
     1:1:java.util.Map findCandidates():39:39 -> a
     2:16:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):53:67 -> a
     2:16:java.util.Map findCandidates():40 -> a
-    17:25:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):116:124 -> a
+    17:25:boolean enumHasBasicStaticFields(com.android.tools.r8.graph.DexProgramClass):104:112 -> a
     17:25:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):70 -> a
     17:25:java.util.Map findCandidates():40 -> a
-    26:53:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):71:98 -> a
-    26:53:java.util.Map findCandidates():40 -> a
-    54:54:boolean isStandardEnumInitializer(com.android.tools.r8.graph.DexEncodedMethod):109:109 -> a
-    54:54:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):99 -> a
-    54:54:java.util.Map findCandidates():40 -> a
-    55:56:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):100:101 -> a
-    55:56:java.util.Map findCandidates():40 -> a
-    57:57:java.util.Map findCandidates():41:41 -> a
-    58:58:void removeEnumsInAnnotations():135:135 -> a
-    58:58:java.util.Map findCandidates():44 -> a
-    59:59:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> a
-    59:59:void removeEnumsInAnnotations():136 -> a
-    59:59:java.util.Map findCandidates():44 -> a
-    60:60:void removeEnumsInAnnotations():137:137 -> a
-    60:60:java.util.Map findCandidates():44 -> a
-    61:61:boolean com.android.tools.r8.graph.DexTypeList.contains(com.android.tools.r8.graph.DexType):33:33 -> a
-    61:61:void removeEnumsInAnnotations():137 -> a
-    61:61:java.util.Map findCandidates():44 -> a
-    62:62:void removeEnumsInAnnotations():137:137 -> a
-    62:62:java.util.Map findCandidates():44 -> a
-    63:64:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):146:147 -> a
-    63:64:void removeEnumsInAnnotations():138 -> a
-    63:64:java.util.Map findCandidates():44 -> a
-    65:65:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexEncodedMethod.parameters():261:261 -> a
-    65:65:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):147 -> a
-    65:65:void removeEnumsInAnnotations():138 -> a
-    65:65:java.util.Map findCandidates():44 -> a
-    66:68:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):147:147 -> a
-    66:68:void removeEnumsInAnnotations():138 -> a
-    66:68:java.util.Map findCandidates():44 -> a
-    70:73:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):149:152 -> a
-    70:73:void removeEnumsInAnnotations():138 -> a
-    70:73:java.util.Map findCandidates():44 -> a
-    74:76:void removePinnedCandidates():161:163 -> a
-    74:76:java.util.Map findCandidates():45 -> a
-    77:79:void removePinnedCandidate(com.android.tools.r8.graph.DexType):187:189 -> a
-    77:79:void removePinnedCandidates():163 -> a
-    77:79:java.util.Map findCandidates():45 -> a
-    80:89:void removePinnedCandidates():164:173 -> a
-    80:89:java.util.Map findCandidates():45 -> a
-    90:93:java.util.Map findCandidates():46:49 -> a
-    94:95:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):180:181 -> a
-    96:98:void removePinnedCandidate(com.android.tools.r8.graph.DexType):187:189 -> a
-    96:98:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):182 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.ir.optimize.s0.h:
+    26:43:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):71:88 -> a
+    26:43:java.util.Map findCandidates():40 -> a
+    44:44:boolean isStandardEnumInitializer(com.android.tools.r8.graph.DexEncodedMethod):97:97 -> a
+    44:44:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):88 -> a
+    44:44:java.util.Map findCandidates():40 -> a
+    45:45:boolean isEnumUnboxingCandidate(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
+    45:45:java.util.Map findCandidates():40 -> a
+    46:46:java.util.Map findCandidates():41:41 -> a
+    47:47:void removeEnumsInAnnotations():123:123 -> a
+    47:47:java.util.Map findCandidates():44 -> a
+    48:48:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> a
+    48:48:void removeEnumsInAnnotations():124 -> a
+    48:48:java.util.Map findCandidates():44 -> a
+    49:49:void removeEnumsInAnnotations():125:125 -> a
+    49:49:java.util.Map findCandidates():44 -> a
+    50:50:boolean com.android.tools.r8.graph.DexTypeList.contains(com.android.tools.r8.graph.DexType):33:33 -> a
+    50:50:void removeEnumsInAnnotations():125 -> a
+    50:50:java.util.Map findCandidates():44 -> a
+    51:51:void removeEnumsInAnnotations():125:125 -> a
+    51:51:java.util.Map findCandidates():44 -> a
+    52:54:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):134:136 -> a
+    52:54:void removeEnumsInAnnotations():126 -> a
+    52:54:java.util.Map findCandidates():44 -> a
+    55:60:void removeEnumsInAnnotation(com.android.tools.r8.graph.DexProgramClass):135:140 -> a
+    55:60:void removeEnumsInAnnotations():126 -> a
+    55:60:java.util.Map findCandidates():44 -> a
+    61:63:void removePinnedCandidates():149:151 -> a
+    61:63:java.util.Map findCandidates():45 -> a
+    64:66:void removePinnedCandidate(com.android.tools.r8.graph.DexType):175:177 -> a
+    64:66:void removePinnedCandidates():151 -> a
+    64:66:java.util.Map findCandidates():45 -> a
+    67:76:void removePinnedCandidates():152:161 -> a
+    67:76:java.util.Map findCandidates():45 -> a
+    77:80:java.util.Map findCandidates():46:49 -> a
+    81:82:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):168:169 -> a
+    83:85:void removePinnedCandidate(com.android.tools.r8.graph.DexType):175:177 -> a
+    83:85:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):170 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.ir.optimize.v0.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map extraUtilityMethods -> d
-    boolean requiresOrdinalUtilityMethod -> i
-    boolean requiresValuesUtilityMethod -> j
-    boolean $assertionsDisabled -> k
-    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> h
-    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> g
+    java.util.Map utilityMethods -> d
+    boolean $assertionsDisabled -> j
+    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> i
+    com.android.tools.r8.graph.DexMethod compareToUtilityMethod -> h
+    com.android.tools.r8.graph.DexMethod equalsUtilityMethod -> g
+    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> f
     com.android.tools.r8.graph.EnumValueInfoMapCollection enumsToUnbox -> c
     java.util.Map extraUtilityFields -> e
-    com.android.tools.r8.graph.DexType utilityClassType -> f
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):77:77 -> <init>
-    2:25:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):67:90 -> <init>
-    26:33:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):88:95 -> <init>
-    34:34:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):93:93 -> <init>
-    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumsToUnbox():100:100 -> a
-    2:6:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):106:110 -> a
-    7:1021:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    7:1021:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):111 -> a
-    1022:1030:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):112:120 -> a
-    1031:1037:boolean isEnumToUnboxOrInt(com.android.tools.r8.ir.analysis.type.TypeElement):216:222 -> a
-    1031:1037:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):120 -> a
-    1038:1040:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):121:123 -> a
-    1041:1041:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1041:1041:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):124 -> a
-    1042:1058:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):125:141 -> a
-    1059:1059:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1059:1059:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):141 -> a
-    1060:1066:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):142:148 -> a
-    1067:1067:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1067:1067:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):144 -> a
-    1068:1081:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):155:168 -> a
-    1082:1086:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType):230:230 -> a
-    1082:1086:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):169 -> a
-    1087:1087:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):170:170 -> a
-    1088:1092:com.android.tools.r8.graph.DexMethod createValuesMethod(com.android.tools.r8.graph.DexType):246:246 -> a
-    1088:1092:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):171 -> a
-    1093:1098:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):172:177 -> a
-    1099:1099:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    1099:1099:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):176 -> a
-    1100:1101:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):178:179 -> a
-    1102:1102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1102:1102:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):178 -> a
-    1103:1106:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):182:185 -> a
-    1107:1107:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    1107:1107:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):185 -> a
-    1108:1108:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1108:1108:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):184 -> a
-    1109:1110:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):190:191 -> a
-    1111:1121:boolean shouldRewriteArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):273:283 -> a
-    1111:1121:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):192 -> a
-    1122:1122:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):193:193 -> a
-    1123:1123:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1123:1123:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):194 -> a
-    1124:1124:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):196:196 -> a
-    1125:1132:boolean validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):204:211 -> a
-    1125:1132:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):196 -> a
-    1133:1133:boolean validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):209:209 -> a
-    1133:1133:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):196 -> a
-    1134:1134:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):199:199 -> a
-    1135:1135:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):174:174 -> a
-    1136:1140:com.android.tools.r8.graph.DexEncodedMethod computeValuesEncodedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,int):254:258 -> a
-    1136:1140:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):174 -> a
-    1141:1141:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):226:226 -> a
-    1142:1146:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):237:241 -> a
-    1147:1150:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):292:295 -> a
-    1151:1152:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():359:360 -> a
-    1151:1152:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296 -> a
-    1153:1173:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:142 -> a
-    1153:1173:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():360 -> a
-    1153:1173:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296 -> a
-    1174:1174:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):139:139 -> a
-    1174:1174:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():360 -> a
-    1174:1174:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296 -> a
-    1175:1197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):130:152 -> a
-    1175:1197:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():360 -> a
-    1175:1197:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296 -> a
-    1198:1198:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():361:361 -> a
-    1198:1198:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296 -> a
-    1199:1201:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):296:298 -> a
-    1202:1203:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():365:366 -> a
-    1202:1203:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299 -> a
-    1204:1243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):156:195 -> a
-    1204:1243:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():366 -> a
-    1204:1243:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299 -> a
-    1244:1244:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():367:367 -> a
-    1244:1244:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299 -> a
-    1245:1272:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):299:326 -> a
-    1273:1274:boolean utilityClassInMainDexList():350:351 -> a
-    1273:1274:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):328 -> a
-    1275:1277:void synthesizeEnumUnboxingUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):328:330 -> a
-    1278:1278:int lambda$synthesizeEnumUnboxingUtilityClass$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):294:294 -> a
-    1279:1279:int lambda$synthesizeEnumUnboxingUtilityClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):306:306 -> a
-    1280:1284:com.android.tools.r8.graph.DexEncodedMethod synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):334:338 -> a
-    1280:1284:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268 -> a
-    1285:1285:com.android.tools.r8.graph.MethodAccessFlags synthesizedMethodAccessFlags(boolean):386:386 -> a
-    1285:1285:com.android.tools.r8.graph.DexEncodedMethod synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):340 -> a
-    1285:1285:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268 -> a
-    1286:1287:com.android.tools.r8.graph.DexEncodedMethod synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):341:342 -> a
-    1286:1287:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):268 -> a
-    1288:1288:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):371:371 -> a
-    1289:1289:com.android.tools.r8.graph.MethodAccessFlags synthesizedMethodAccessFlags(boolean):386:386 -> a
-    1289:1289:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):373 -> a
-    1290:1291:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):374:375 -> a
-    1:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):262:267 -> b
-    7:11:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):264:268 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.ir.optimize.s0.i:
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):76:76 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):68:89 -> <init>
+    24:31:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):87:94 -> <init>
+    32:39:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):92:99 -> <init>
+    40:48:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):97:105 -> <init>
+    49:49:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):103:103 -> <init>
+    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumsToUnbox():110:110 -> a
+    2:7:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):116:121 -> a
+    8:1022:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
+    8:1022:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):122 -> a
+    1023:1030:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):123:130 -> a
+    1031:1039:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):260:268 -> a
+    1031:1039:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):130 -> a
+    1040:1057:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):132:149 -> a
+    1058:1058:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1058:1058:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):147 -> a
+    1059:1071:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):154:166 -> a
+    1072:1072:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1072:1072:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):166 -> a
+    1073:1079:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):167:173 -> a
+    1080:1080:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1080:1080:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):174 -> a
+    1081:1101:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):175:195 -> a
+    1102:1106:com.android.tools.r8.graph.DexField createValuesField(com.android.tools.r8.graph.DexType):276:276 -> a
+    1102:1106:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):197 -> a
+    1107:1107:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):198:198 -> a
+    1108:1112:com.android.tools.r8.graph.DexMethod createValuesMethod(com.android.tools.r8.graph.DexType):292:292 -> a
+    1108:1112:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):199 -> a
+    1113:1118:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):200:205 -> a
+    1119:1119:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    1119:1119:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):204 -> a
+    1120:1121:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):206:207 -> a
+    1122:1122:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1122:1122:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):208 -> a
+    1123:1128:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):209:214 -> a
+    1129:1129:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
+    1129:1129:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):214 -> a
+    1130:1130:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1130:1130:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):215 -> a
+    1131:1137:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):216:222 -> a
+    1138:1151:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess):334:347 -> a
+    1138:1151:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):223 -> a
+    1152:1152:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):225:225 -> a
+    1153:1153:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1153:1153:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):226 -> a
+    1154:1156:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):227:229 -> a
+    1157:1164:boolean validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):248:255 -> a
+    1157:1164:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):229 -> a
+    1165:1165:boolean validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):253:253 -> a
+    1165:1165:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):229 -> a
+    1166:1166:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):232:232 -> a
+    1167:1167:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):202:202 -> a
+    1168:1176:com.android.tools.r8.graph.DexEncodedMethod computeValuesEncodedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,int):300:308 -> a
+    1168:1176:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):202 -> a
+    1177:1179:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,java.util.function.Function):241:243 -> a
+    1180:1180:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1180:1180:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexMethod,java.util.function.Function):244 -> a
+    1181:1181:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):272:272 -> a
+    1182:1186:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):283:287 -> a
+    1187:1200:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):355:368 -> a
+    1201:1202:boolean utilityClassInMainDexList():423:424 -> a
+    1201:1202:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):369 -> a
+    1203:1206:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):370:373 -> a
+    1207:1207:int lambda$synthesizeEnumUnboxingUtilityMethods$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):357:357 -> a
+    1208:1208:int lambda$synthesizeEnumUnboxingUtilityMethods$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):362:362 -> a
+    1209:1227:com.android.tools.r8.graph.DexProgramClass synthesizeEmptyEnumUnboxingUtilityClass(com.android.tools.r8.graph.AppView):377:395 -> a
+    1228:1235:com.android.tools.r8.graph.DexEncodedMethod synthesizeToStringUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):400:407 -> a
+    1228:1235:com.android.tools.r8.graph.DexEncodedMethod lambda$computeDefaultToStringUtilityMethod$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):329 -> a
+    1236:1237:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():432:433 -> a
+    1236:1237:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):134 -> a
+    1238:1258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:142 -> a
+    1238:1258:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():433 -> a
+    1238:1258:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):134 -> a
+    1259:1259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):139:139 -> a
+    1259:1259:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():433 -> a
+    1259:1259:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):134 -> a
+    1260:1282:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):130:152 -> a
+    1260:1282:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():433 -> a
+    1260:1282:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):134 -> a
+    1283:1283:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():434:434 -> a
+    1283:1283:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):134 -> a
+    1284:1284:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):457:457 -> a
+    1285:1285:com.android.tools.r8.graph.MethodAccessFlags synthesizedMethodAccessFlags(boolean):472:472 -> a
+    1285:1285:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):459 -> a
+    1286:1287:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):460:461 -> a
+    1:6:com.android.tools.r8.graph.DexMethod computeDefaultToStringUtilityMethod(com.android.tools.r8.graph.DexType):323:328 -> b
+    7:11:com.android.tools.r8.graph.DexMethod computeDefaultToStringUtilityMethod(com.android.tools.r8.graph.DexType):325:329 -> b
+    12:19:com.android.tools.r8.graph.DexEncodedMethod synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):411:418 -> b
+    12:19:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):318 -> b
+    20:21:com.android.tools.r8.graph.DexEncodedMethod synthesizeEqualsMethod():438:439 -> b
+    20:21:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):138 -> b
+    22:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):81:103 -> b
+    22:44:com.android.tools.r8.graph.DexEncodedMethod synthesizeEqualsMethod():439 -> b
+    22:44:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):138 -> b
+    45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):100:100 -> b
+    45:45:com.android.tools.r8.graph.DexEncodedMethod synthesizeEqualsMethod():439 -> b
+    45:45:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):138 -> b
+    46:73:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):91:118 -> b
+    46:73:com.android.tools.r8.graph.DexEncodedMethod synthesizeEqualsMethod():439 -> b
+    46:73:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):138 -> b
+    74:74:com.android.tools.r8.graph.DexEncodedMethod synthesizeEqualsMethod():440:440 -> b
+    74:74:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):138 -> b
+    1:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):312:317 -> c
+    7:11:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):314:318 -> c
+    12:14:com.android.tools.r8.graph.DexEncodedMethod synthesizeCompareToMethod():444:446 -> c
+    12:14:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):142 -> c
+    15:37:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):45:67 -> c
+    15:37:com.android.tools.r8.graph.DexEncodedMethod synthesizeCompareToMethod():445 -> c
+    15:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):142 -> c
+    38:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):64:64 -> c
+    38:38:com.android.tools.r8.graph.DexEncodedMethod synthesizeCompareToMethod():445 -> c
+    38:38:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):142 -> c
+    39:63:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):53:77 -> c
+    39:63:com.android.tools.r8.graph.DexEncodedMethod synthesizeCompareToMethod():445 -> c
+    39:63:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):142 -> c
+    64:64:com.android.tools.r8.graph.DexEncodedMethod synthesizeCompareToMethod():447:447 -> c
+    64:64:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):142 -> c
+    1:2:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():451:452 -> d
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):196 -> d
+    3:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):156:195 -> d
+    3:42:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():452 -> d
+    3:42:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):196 -> d
+    43:43:com.android.tools.r8.graph.DexEncodedMethod synthesizeValuesUtilityMethod():453:453 -> d
+    43:43:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):196 -> d
+com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.ir.optimize.v0.i:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder valueInfoMapsBuilder -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):37:37 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):35:38 -> <init>
     1:8:com.android.tools.r8.shaking.AppInfoWithLiveness run():42:49 -> a
     9:47:void processClasses(com.android.tools.r8.graph.DexProgramClass):54:92 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.ir.optimize.s0.l:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.ir.optimize.v0.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -37557,7 +38051,7 @@
     1:4:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):167:170 -> a
     5:16:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):317:328 -> a
     5:16:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):176 -> a
-    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     17:17:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):328 -> a
     17:17:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):176 -> a
     18:47:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):329:358 -> a
@@ -37577,10 +38071,10 @@
     92:92:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
     92:92:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):240 -> a
     93:100:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):241:248 -> a
-    101:101:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    101:101:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> a
     101:101:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):251 -> a
     102:102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    102:102:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> a
+    102:102:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> a
     102:102:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):251 -> a
     103:119:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):255:271 -> a
     120:120:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
@@ -37601,8 +38095,8 @@
     62:62:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
     62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):122 -> b
     63:81:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):125:143 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.ir.optimize.s0.j:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.s0.k:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.ir.optimize.v0.j:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.v0.k:
     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
@@ -37610,52 +38104,65 @@
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap valueInfoMap -> e
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1):275:275 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):290:296 -> <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
-    1:1:void <clinit>():8:8 -> <clinit>
-    1:1:void <init>():10:10 -> <init>
-    boolean isBottom() -> b
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.b:
-    com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo TOP -> b
-    com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo BOTTOM -> a
-    boolean $assertionsDisabled -> c
-    1:3:void <clinit>():15:17 -> <clinit>
+com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.a:
+    com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo INSTANCE -> b
+    1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
-    com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
+    boolean isAbandoned() -> d
+    1:1:com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo getInstance():18:18 -> i
+com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.b:
+    com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo INSTANCE -> b
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:1:void <init>():12:12 -> <init>
+    boolean isBottom() -> e
+    1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo getInstance():15:15 -> i
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.c:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>():16:16 -> <init>
     boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod) -> a
-    1:12:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):37:48 -> a
-    13:13:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):44:44 -> a
-    14:14:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):72:72 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo abandoned():19:19 -> a
+    2:13:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):52:63 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.AbandonedCallSiteOptimizationInfo abandoned():19:19 -> a
+    14:14:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):53 -> a
+    15:15:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):91:91 -> a
+    com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> b
     com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(int) -> b
-    boolean isBottom() -> b
-    boolean isConcreteCallSiteOptimizationInfo() -> c
-    boolean isTop() -> d
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.c:
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> f
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> e
-    boolean $assertionsDisabled -> g
-    int size -> d
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:5:void <init>(int,boolean):38:42 -> <init>
-    com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
-    1:26:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):47:72 -> a
-    27:35:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):71:79 -> a
-    36:46:com.android.tools.r8.ir.analysis.type.TypeElement[] getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):83:93 -> a
-    36:46:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):100 -> a
-    47:47:com.android.tools.r8.ir.analysis.type.TypeElement[] getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
-    47:47:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):100 -> a
-    48:78:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):101:131 -> a
-    79:84:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):147:152 -> a
-    85:86:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):159:160 -> a
-    87:87:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):34:34 -> a
-    87:87:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):160 -> a
-    88:115:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):162:189 -> a
-    1:3:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(int):140:142 -> b
-    boolean isConcreteCallSiteOptimizationInfo() -> c
-    1:6:boolean equals(java.lang.Object):204:209 -> equals
-    1:2:int hashCode():214:215 -> hashCode
-    1:2:java.lang.String toString():220:221 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.d:
+    1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo bottom():23:23 -> c
+    boolean isAbandoned() -> d
+    boolean isBottom() -> e
+    boolean isConcreteCallSiteOptimizationInfo() -> f
+    boolean isTop() -> g
+    1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():27:27 -> h
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.d:
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> c
+    int size -> b
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:5:void <init>(int,boolean):34:38 -> <init>
+    1:26:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):43:68 -> a
+    27:30:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):67:70 -> a
+    31:31:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():27:27 -> a
+    31:31:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo join(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):75 -> a
+    32:40:com.android.tools.r8.ir.analysis.type.TypeElement[] getStaticTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):79:87 -> a
+    32:40:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):94 -> a
+    41:71:boolean hasUsefulOptimizationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):95:125 -> a
+    72:77:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):141:146 -> a
+    78:104:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):155:181 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getParameter(int):24:24 -> a
+    105:105:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):181 -> a
+    106:106:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):182:182 -> a
+    107:116:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):180:189 -> a
+    117:117:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():27:27 -> a
+    117:117:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fromArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.ProgramMethod):193 -> a
+    com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> b
+    1:3:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(int):134:136 -> b
+    1:6:boolean equals(java.lang.Object):208:213 -> equals
+    boolean isConcreteCallSiteOptimizationInfo() -> f
+    1:2:int hashCode():218:219 -> hashCode
+    1:2:java.lang.String toString():224:225 -> toString
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.e:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -37669,7 +38176,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():24:24 -> j
     boolean valueHasBeenPropagated() -> k
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> l
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.e:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.f:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> e
     boolean $assertionsDisabled -> f
@@ -37708,7 +38215,7 @@
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType() -> x
     boolean hasBeenInlinedIntoSingleCallSite() -> y
     boolean isInitializerEnablingJavaVmAssertions() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.f:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.g:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -37721,13 +38228,13 @@
     boolean isMutableFieldOptimizationInfo() -> i
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> j
     boolean valueHasBeenPropagated() -> k
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.ir.optimize.info.g:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.ir.optimize.info.h:
     com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
     1:1:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.h:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.i:
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo getClassInlinerEligibility() -> A
     java.util.Set getInitializedClassesOnNormalExit() -> B
     java.util.BitSet getNonNullParamOrThrow() -> C
@@ -37758,337 +38265,335 @@
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType() -> x
     boolean hasBeenInlinedIntoSingleCallSite() -> y
     boolean isInitializerEnablingJavaVmAssertions() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.ir.optimize.info.j:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.ir.optimize.info.i$a:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
+    1:3:void <clinit>():21:23 -> <clinit>
+    1:1:void <init>(java.lang.String,int):20:20 -> <init>
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.ir.optimize.info.k:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):117:120 -> <init>
-    1:3:void identifyBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):149:151 -> a
-    1:3: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):130 -> a
-    4:6:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):156:158 -> a
-    4:6: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):131 -> a
-    7:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):304:304 -> a
-    7:7: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    8:11:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):311:314 -> a
-    8:11:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):305 -> a
-    8:11: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    12:29:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):328:345 -> a
-    12:29:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):315 -> a
-    12:29:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):305 -> a
-    12:29: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    30:37:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):317:324 -> a
-    30:37:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):305 -> a
-    30:37: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    38:38:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):320:320 -> a
-    38:38:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):305 -> a
-    38:38: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    39:39:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):306:306 -> a
-    39:39: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
-    40:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):350:350 -> a
-    40:40: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
-    41:75:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):357:391 -> a
-    41:75:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):351 -> a
-    41:75: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
-    76:76:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):352:352 -> a
-    76:76: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
-    77:77: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):134:134 -> a
-    78:78:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):687:687 -> a
-    78:78: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135 -> a
-    79:82:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):694:697 -> a
-    79:82:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):688 -> a
-    79:82: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135 -> a
-    83:89:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):696:702 -> a
-    83:89:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):688 -> a
-    83:89: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135 -> a
-    90:90:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):701:701 -> a
-    90:90:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):688 -> a
-    90:90: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135 -> a
-    91:91:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):689:689 -> a
-    91:91: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135 -> a
-    92:92:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):953:953 -> a
-    92:92: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):137 -> a
-    93:111:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):964:982 -> a
-    93:111:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):954 -> a
-    93:111: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):137 -> a
-    112:112:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):955:955 -> a
-    112:112: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):137 -> a
-    113:113:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):989:989 -> a
+    1:1:void <clinit>():113:113 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):118:121 -> <init>
+    1:3:void identifyBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):150:152 -> a
+    1:3: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):131 -> a
+    4:6:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):157:159 -> a
+    4:6: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):132 -> a
+    7:7:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):300:300 -> a
+    7:7: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    8:11:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):307:310 -> a
+    8:11:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):301 -> a
+    8:11: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    12:29:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):324:341 -> a
+    12:29:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):311 -> a
+    12:29:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):301 -> a
+    12:29: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    30:37:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):313:320 -> a
+    30:37:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):301 -> a
+    30:37: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    38:38:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):316:316 -> a
+    38:38:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):301 -> a
+    38:38: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    39:39:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):302:302 -> a
+    39:39: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):133 -> a
+    40:40:void identifyReturnsArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):345:345 -> a
+    40:40: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):134 -> a
+    41:76:void identifyReturnsArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):351:386 -> a
+    41:76:void identifyReturnsArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):346 -> a
+    41:76: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):134 -> a
+    77:77:void identifyReturnsArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):347:347 -> a
+    77:77: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):134 -> a
+    78:78: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):135:135 -> a
+    79:79:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):677:677 -> a
+    79:79: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):136 -> a
+    80:83:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):684:687 -> a
+    80:83:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):678 -> a
+    80:83: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):136 -> a
+    84:90:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):686:692 -> a
+    84:90:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):678 -> a
+    84:90: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):136 -> a
+    91:91:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):691:691 -> a
+    91:91:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):678 -> a
+    91:91: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):136 -> a
+    92:92:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):679:679 -> a
+    92:92: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):136 -> a
+    93:93:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):946:946 -> a
+    93:93: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):138 -> a
+    94:112:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):957:975 -> a
+    94:112:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):947 -> a
+    94:112: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):138 -> a
+    113:113:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):948:948 -> a
     113:113: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):138 -> a
-    114:120:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):996:1002 -> a
-    114:120:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):990 -> a
-    114:120: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):138 -> a
-    121:121:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):991:991 -> a
-    121:121: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):138 -> a
-    122:122:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):401:401 -> a
+    114:114:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):982:982 -> a
+    114:114: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
+    115:121:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):989:995 -> a
+    115:121:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):983 -> a
+    115:121: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
+    122:122:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):984:984 -> a
     122:122: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    123:141:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):411:429 -> a
-    123:141:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    123:141: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    142:194:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.builder(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):0:52 -> a
-    142:194:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):434 -> a
-    142:194:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    142:194: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    195:395:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):461:661 -> a
-    195:395:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    195:395:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    195:395: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    396:397:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):646:647 -> a
-    396:397:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    396:397:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    396:397: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    398:398:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    398:398:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):647 -> a
-    398:398:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    398:398:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    398:398: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    399:400:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):650:651 -> a
-    399:400:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    399:400:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    399:400: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    401:402:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):614:615 -> a
-    401:402:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    401:402:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    401:402: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    403:403:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):574:574 -> a
-    403:403:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):615 -> a
-    403:403:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    403:403:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    403:403: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    404:406:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):616:618 -> a
-    404:406:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    404:406:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    404:406: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    407:407:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    407:407:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):619 -> a
-    407:407:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    407:407:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    407:407: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    408:423:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):620:635 -> a
-    408:423:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    408:423:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    408:423: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    424:424:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    424:424:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):636 -> a
-    424:424:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    424:424:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    424:424: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    425:425:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):637:637 -> a
-    425:425:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    425:425:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    425:425: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    426:428:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):565:567 -> a
-    426:428:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    426:428:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    426:428: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    429:429:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    429:429:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):567 -> a
-    429:429:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    429:429:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    429:429: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    430:443:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):571:584 -> a
-    430:443:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    430:443:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    430:443: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    444:444:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    444:444:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):584 -> a
-    444:444:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    444:444:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    444:444: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    445:453:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):589:597 -> a
-    445:453:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    445:453:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    445:453: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    454:478:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):578:602 -> a
-    454:478:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    454:478:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    454:478: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    479:479:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    479:479:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):603 -> a
-    479:479:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    479:479:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    479:479: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    480:480:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):604:604 -> a
-    480:480:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    480:480:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    480:480: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    481:487:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):539:545 -> a
-    481:487:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    481:487:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    481:487: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    488:488:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    488:488:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):545 -> a
-    488:488:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    488:488:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    488:488: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    489:489:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):546:546 -> a
-    489:489:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    489:489:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    489:489: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    490:490:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65:65 -> a
-    490:490:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):547 -> a
-    490:490:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    490:490:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    490:490: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    491:495:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):547:551 -> a
-    491:495:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    491:495:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    491:495: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    496:496:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    496:496:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):551 -> a
-    496:496:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    496:496:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    496:496: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    497:501:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):554:558 -> a
-    497:501:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    497:501:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    497:501: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    502:512:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):521:531 -> a
-    502:512:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    502:512:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    502:512: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    513:710:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):485:682 -> a
-    513:710:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
-    513:710:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    513:710: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    711:711:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):441:441 -> a
-    711:711:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    711:711: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    712:712:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437:437 -> a
-    712:712:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):402 -> a
-    712:712: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    713:713:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):403:403 -> a
-    713:713: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):139 -> a
-    714:714:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1009:1009 -> a
-    714:714: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    715:726:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1017:1028 -> a
-    715:726:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    715:726: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    727:742:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:57 -> a
-    727:742:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
-    727:742:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    727:742: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    743:743:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):590:590 -> a
-    743:743:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58 -> a
-    743:743:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
-    743:743:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    743:743: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    744:752:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):58:66 -> a
-    744:752:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
-    744:752:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    744:752: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    753:779:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:85 -> a
-    753:779:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
-    753:779:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    753:779: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    780:835:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):78:133 -> a
-    780:835:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
-    780:835:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    780:835: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    836:836:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    836:836:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1030 -> a
-    836:836:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    836:836: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    837:838:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1031:1032 -> a
-    837:838:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    837:838: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    839:839:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
-    839:839:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1033 -> a
-    839:839:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    839:839: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    840:842:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1034:1036 -> a
-    840:842:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    840:842: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    843:844:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():258:259 -> a
-    843:844:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1036 -> a
-    843:844:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    843:844: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    845:848:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1036:1036 -> a
-    845:848:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    845:848: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    851:859:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1039:1047 -> a
-    851:859:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    851:859: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    860:860:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1070:1070 -> a
-    860:860:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1047 -> a
-    860:860:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    860:860: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    861:861:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    861:861:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1070 -> a
-    861:861:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1047 -> a
-    861:861:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    861:861: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    862:870:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):1072:1080 -> a
-    862:870:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1047 -> a
-    862:870:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    862:870: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    871:879:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1055:1063 -> a
-    871:879:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1010 -> a
-    871:879: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    880:880:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1011:1011 -> a
-    880:880: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141 -> a
-    881:881:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1096:1096 -> a
-    881:881: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
-    882:888:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1103:1109 -> a
-    882:888:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1097 -> a
-    882:888: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
-    889:889:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1098:1098 -> a
-    889:889: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
-    890:890:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1115:1115 -> a
-    890:890: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
-    891:913:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1123:1145 -> a
-    891:913:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1116 -> a
-    891:913: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
-    914:914:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1117:1117 -> a
-    914:914: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
-    915:915:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1151:1151 -> a
-    915:915: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    916:947:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1157:1188 -> a
-    916:947:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1152 -> a
-    916:947: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    948:993:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1210:1255 -> a
-    948:993:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1189 -> a
-    948:993:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1152 -> a
-    948:993: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    994:999:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1195:1200 -> a
-    994:999:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1152 -> a
-    994:999: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    1000:1000:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1153:1153 -> a
-    1000:1000: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    1001:1014:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):176:189 -> a
-    1015:1015:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1015:1015:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189 -> a
-    1016:1099:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194:277 -> a
-    1100:1106:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):252:258 -> a
-    1107:1111:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):236:240 -> a
-    1112:1195:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):215:298 -> a
-    1196:1196:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294:294 -> a
-    1197:1197:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):271:271 -> a
-    1197:1197:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):200 -> a
-    1198:1198:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):714:714 -> a
-    1199:1215:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):717:733 -> a
-    1216:1274:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):745:803 -> a
-    1275:1314:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):764:803 -> a
-    1315:1327:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):791:803 -> a
-    1328:1328:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):814:814 -> a
-    1329:1333:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):817:821 -> a
-    1334:1352:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):897:915 -> a
-    1334:1352:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):823 -> a
-    1353:1372:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):824:843 -> a
-    1373:1378:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):842:847 -> a
-    1379:1386:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):934:941 -> a
-    1379:1386:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):847 -> a
-    1387:1407:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):848:868 -> a
-    1408:1410:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):923:925 -> a
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.ir.optimize.info.i:
+    123:123:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):396:396 -> a
+    123:123: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    124:136:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):406:418 -> a
+    124:136:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    124:136: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    137:189:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.builder(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):0:52 -> a
+    137:189:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):423 -> a
+    137:189:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    137:189: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    190:392:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):449:651 -> a
+    190:392:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    190:392:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    190:392: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    393:394:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):636:637 -> a
+    393:394:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    393:394:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    393:394: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    395:395:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    395:395:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):637 -> a
+    395:395:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    395:395:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    395:395: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    396:397:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):640:641 -> a
+    396:397:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    396:397:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    396:397: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    398:399:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):604:605 -> a
+    398:399:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    398:399:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    398:399: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    400:400:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):574:574 -> a
+    400:400:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):605 -> a
+    400:400:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    400:400:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    400:400: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    401:403:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):606:608 -> a
+    401:403:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    401:403:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    401:403: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    404:404:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    404:404:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):609 -> a
+    404:404:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    404:404:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    404:404: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    405:420:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):610:625 -> a
+    405:420:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    405:420:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    405:420: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    421:421:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    421:421:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):626 -> a
+    421:421:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    421:421:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    421:421: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    422:422:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):627:627 -> a
+    422:422:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    422:422:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    422:422: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    423:425:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):555:557 -> a
+    423:425:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    423:425:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    423:425: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    426:426:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    426:426:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):557 -> a
+    426:426:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    426:426:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    426:426: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    427:440:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):561:574 -> a
+    427:440:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    427:440:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    427:440: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    441:441:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    441:441:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):574 -> a
+    441:441:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    441:441:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    441:441: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    442:450:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):579:587 -> a
+    442:450:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    442:450:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    442:450: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    451:475:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):568:592 -> a
+    451:475:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    451:475:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    451:475: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    476:476:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    476:476:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):593 -> a
+    476:476:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    476:476:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    476:476: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    477:477:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):594:594 -> a
+    477:477:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    477:477:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    477:477: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    478:485:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):529:536 -> a
+    478:485:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    478:485:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    478:485: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    486:486:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    486:486:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):536 -> a
+    486:486:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    486:486:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    486:486: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    487:487:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):537:537 -> a
+    487:487:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    487:487:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    487:487: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    488:488:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):63:63 -> a
+    488:488:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):537 -> a
+    488:488:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    488:488:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    488:488: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    489:492:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):538:541 -> a
+    489:492:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    489:492:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    489:492: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    493:493:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    493:493:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):541 -> a
+    493:493:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    493:493:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    493:493: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    494:498:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):544:548 -> a
+    494:498:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    494:498:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    494:498: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    499:510:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):510:521 -> a
+    499:510:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    499:510:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    499:510: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    511:709:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):474:672 -> a
+    511:709:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):424 -> a
+    511:709:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    511:709: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    710:710:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):429:429 -> a
+    710:710:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    710:710: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    711:711:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):425:425 -> a
+    711:711:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):397 -> a
+    711:711: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    712:712:void computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):398:398 -> a
+    712:712: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):140 -> a
+    713:713:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1002:1002 -> a
+    713:713: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    714:725:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1010:1021 -> a
+    714:725:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    714:725: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    726:741:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):43:58 -> a
+    726:741:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1022 -> a
+    726:741:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    726:741: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    742:742:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):590:590 -> a
+    742:742:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
+    742:742:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1022 -> a
+    742:742:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    742:742: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    743:748:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62:67 -> a
+    743:748:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1022 -> a
+    743:748:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    743:748: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    749:775:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:86 -> a
+    749:775:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1022 -> a
+    749:775:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    749:775: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    776:832:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):79:135 -> a
+    776:832:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1022 -> a
+    776:832:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    776:832: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    833:833:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():33:33 -> a
+    833:833:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1023 -> a
+    833:833:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    833:833: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    834:835:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1024:1025 -> a
+    834:835:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    834:835: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    836:836:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():29:29 -> a
+    836:836:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1026 -> a
+    836:836:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    836:836: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    837:839:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1027:1029 -> a
+    837:839:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    837:839: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    840:841:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():258:259 -> a
+    840:841:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029 -> a
+    840:841:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    840:841: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    842:845:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1029:1029 -> a
+    842:845:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    842:845: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    848:856:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1032:1040 -> a
+    848:856:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    848:856: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    857:866:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1062:1071 -> a
+    857:866:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1040 -> a
+    857:866:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    857:866: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    867:875:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1048:1056 -> a
+    867:875:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1003 -> a
+    867:875: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    876:876:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1004:1004 -> a
+    876:876: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    877:877:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1078:1078 -> a
+    877:877: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
+    878:884:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1085:1091 -> a
+    878:884:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1079 -> a
+    878:884: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
+    885:885:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1080:1080 -> a
+    885:885: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
+    886:886:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1097:1097 -> a
+    886:886: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    887:909:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1105:1127 -> a
+    887:909:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1098 -> a
+    887:909: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    910:910:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1099:1099 -> a
+    910:910: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    911:911:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1133:1133 -> a
+    911:911: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    912:943:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1139:1170 -> a
+    912:943:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1134 -> a
+    912:943: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    944:989:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1192:1237 -> a
+    944:989:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1171 -> a
+    944:989:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1134 -> a
+    944:989: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    990:995:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1177:1182 -> a
+    990:995:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1134 -> a
+    990:995: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    996:996:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1135:1135 -> a
+    996:996: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,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    997:999:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):176:178 -> a
+    1000:1000:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():334:334 -> a
+    1000:1000:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):179 -> a
+    1001:1094:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):180:273 -> a
+    1095:1101:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):248:254 -> a
+    1102:1106:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):232:236 -> a
+    1107:1189:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):212:294 -> a
+    1190:1190:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):290:290 -> a
+    1191:1191:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):272:272 -> a
+    1191:1191:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):197 -> a
+    1192:1192:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):703:703 -> a
+    1193:1195:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):706:708 -> a
+    1196:1215:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):707:726 -> a
+    1216:1274:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):738:796 -> a
+    1275:1314:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):757:796 -> a
+    1315:1328:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):784:797 -> a
+    1329:1329:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):807:807 -> a
+    1330:1336:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):810:816 -> a
+    1337:1355:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):890:908 -> a
+    1337:1355:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):816 -> a
+    1356:1375:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):817:836 -> a
+    1376:1381:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):835:840 -> a
+    1382:1389:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):927:934 -> a
+    1382:1389:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):840 -> a
+    1390:1410:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):841:861 -> a
+    1411:1413:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):916:918 -> a
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.ir.optimize.info.j:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():887:890 -> <clinit>
-    1:1:void <init>(java.lang.String,int):886:886 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.k:
+    1:4:void <clinit>():880:883 -> <clinit>
+    1:1:void <init>(java.lang.String,int):879:879 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.l:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> d
     boolean $assertionsDisabled -> f
     int flags -> b
@@ -38116,16 +38621,16 @@
     1:1:void markAsDead():118:118 -> l
     1:1:void markAsPropagated():127:127 -> m
     1:1:void markCannotBeKept():91:91 -> n
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.l:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.m:
     1:1:void <init>():18:18 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):32:32 -> a
     2:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):31:31 -> a
     3:4:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):34:35 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.ir.optimize.info.l$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.ir.optimize.info.m$a:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.optimize.info.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.optimize.info.n:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -38171,7 +38676,7 @@
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> g
     1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> h
     1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):54:59 -> i
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.o:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -38204,9 +38709,9 @@
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> g
     void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> h
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.n$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.o$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.o:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.p:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -38220,7 +38725,6 @@
     void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void methodReturnsObjectWithUpperBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
-    void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo) -> a
     void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo) -> a
     void setInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo) -> a
     void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo) -> a
@@ -38228,7 +38732,8 @@
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):46:46 -> a
     3:3:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):95:95 -> a
     4:4:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):144:144 -> a
-    5:5:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):186:186 -> a
+    5:5:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):159:159 -> a
+    6:6:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):186:186 -> a
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):36:36 -> b
@@ -38240,7 +38745,7 @@
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> f
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> g
     1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):176:176 -> h
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.ir.optimize.info.p:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.ir.optimize.info.q:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():31:31 -> <clinit>
@@ -38255,7 +38760,7 @@
     9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):117:118 -> b
     9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58 -> b
     11:24:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58:71 -> b
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.ir.optimize.info.p$a:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.ir.optimize.info.q$a:
     boolean $assertionsDisabled -> i
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
@@ -38268,7 +38773,7 @@
     1:1:void <clinit>():74:74 -> <clinit>
     1:11:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean,boolean):103:113 -> <init>
     1:2:boolean notUsed():130:131 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.ir.optimize.info.q:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.ir.optimize.info.r:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     boolean isReturned -> i
     java.util.Set ifZeroTestTypes -> d
@@ -38310,12 +38815,13 @@
     51:51:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):239:239 -> a
     52:57:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):238:243 -> a
     58:58:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):240:240 -> a
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.r:
-    com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> d
-    1:1:void <clinit>():8:8 -> <clinit>
-    1:1:void <init>():10:10 -> <init>
-    boolean isTop() -> d
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.s:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.s:
+    com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> b
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:1:void <init>():11:11 -> <init>
+    boolean isTop() -> g
+    1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo getInstance():14:14 -> i
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.t:
     int DEFAULT_FLAGS -> n
     com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> j
     boolean $assertionsDisabled -> o
@@ -38410,12 +38916,12 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():242:242 -> x
     1:1:boolean hasBeenInlinedIntoSingleCallSite():272:272 -> y
     1:1:boolean isInitializerEnablingJavaVmAssertions():326:326 -> z
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.ir.optimize.info.t.a:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.ir.optimize.info.u.a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:11:boolean analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):99:109 -> a
     1:11:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
-    12:12:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():444:444 -> a
+    12:12:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():445:445 -> a
     12:12:boolean analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):109 -> a
     12:12:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     13:26:boolean analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):112:125 -> a
@@ -38427,34 +38933,27 @@
     28:28:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     29:37:boolean analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):138:146 -> a
     29:37:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    38:38:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():444:444 -> a
+    38:38:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():445:445 -> a
     38:38:boolean analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):147 -> a
     38:38:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     39:39:boolean analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):148:148 -> a
     39:39:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    40:40:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():329:329 -> a
+    40:40:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():326:326 -> a
     40:40:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27 -> a
     41:91:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27:77 -> a
-    92:93:boolean analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.CheckCast):168:169 -> a
-    92:93:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):77 -> a
-    94:94:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):67:67 -> a
-    95:97:boolean analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual):153:155 -> a
-    95:97:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
-    98:99:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:88 -> a
-com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo -> com.android.tools.r8.ir.optimize.info.t.b:
-    1:1:void <init>():10:10 -> <init>
-    boolean hasSameTarget(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo) -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.ir.optimize.info.t.c:
-    boolean $assertionsDisabled -> b
+    92:94:boolean analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.CheckCast):168:170 -> a
+    92:94:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):77 -> a
+    95:95:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):67:67 -> a
+    96:98:boolean analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual):153:155 -> a
+    96:98:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
+    99:100:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:88 -> a
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.ir.optimize.info.u.b:
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):32:33 -> <init>
+    1:1:void com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo.<init>():10:10 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):32 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexMethod):33:33 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-    2:3:boolean hasSameTarget(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):42:43 -> a
-    4:4:com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo asVirtualBridgeInfo():0:0 -> a
-    4:4:boolean hasSameTarget(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):43 -> a
-    5:5:boolean hasSameTarget(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):44:44 -> a
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.u.a:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.v.a:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38463,14 +38962,14 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):39:39 -> a
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():27:27 -> c
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.ir.optimize.info.u.b:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.ir.optimize.info.v.b:
     int argumentIndex -> a
     1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> b
     boolean isArgumentInitializationInfo() -> e
     1:1:int getArgumentIndex():25:25 -> g
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.ir.optimize.info.u.c:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.ir.optimize.info.v.c:
     boolean isTypeInitializationInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> b
@@ -38478,36 +38977,35 @@
     boolean isUnknown() -> d
     boolean isArgumentInitializationInfo() -> e
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> f
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.u.e:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.v.e:
     1:1:void <init>():24:24 -> <init>
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():27:27 -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.ir.optimize.info.u.d:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.ir.optimize.info.v.d:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
     1:3:void <init>():41:43 -> <init>
     1:2:void recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):51:52 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():56:59 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.ir.optimize.info.u.f:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.ir.optimize.info.v.f:
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
     4:4:com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo createTypeInitializationInfo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:24 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.ir.optimize.info.u.g:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.ir.optimize.info.v.g:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):26:28 -> <init>
     boolean isTypeInitializationInfo() -> a
-    1:16:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):52:67 -> a
-    17:21:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):66:70 -> a
-    22:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):69:69 -> a
+    1:19:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):52:70 -> a
+    20:20:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):69:69 -> a
     1:6:boolean equals(java.lang.Object):83:88 -> equals
     1:1:int hashCode():75:75 -> hashCode
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.u.h:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.ir.optimize.info.v.h:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -38522,14 +39020,14 @@
     13:13:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField):46:46 -> a
     14:17:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):60:63 -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.ir.optimize.info.u.i:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.ir.optimize.info.v.i:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
     boolean isUnknown() -> d
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():23:23 -> g
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.v.a:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.w.a:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -38541,7 +39039,7 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():39:39 -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():24:24 -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.v.b:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.w.b:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense) -> a
@@ -38550,7 +39048,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> d
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.v.e:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.ir.optimize.info.w.e:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -38569,8 +39067,8 @@
     1:1:boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments():77:77 -> d
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():67:67 -> e
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():82:82 -> f
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.ir.optimize.info.v.c:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.ir.optimize.info.v.d:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.ir.optimize.info.w.c:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.ir.optimize.info.w.d:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -38605,7 +39103,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():165:165 -> e
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():174:174 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():179:179 -> g
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.t0.a:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.ir.optimize.w0.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
@@ -38617,16 +39115,16 @@
     22:24:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     25:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):58:60 -> a
     28:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.ir.optimize.t0.b:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.ir.optimize.w0.b:
     1:1:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.t0.c:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.w0.c:
     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.t0.d:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.ir.optimize.w0.d:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -38644,9 +39142,9 @@
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):36:42 -> b
     8:9:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):32:33 -> b
     8:9:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):42 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.t0.e:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.ir.optimize.w0.e:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.t0.f:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.w0.f:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -38684,7 +39182,7 @@
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> y
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.t0.g:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.w0.g:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
     void reportIncorrectArity(int,int) -> a
@@ -38692,8 +39190,8 @@
     void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut) -> a
     void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect) -> a
     void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction) -> a
-    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):22:26 -> a
-    6:19:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):31:44 -> a
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22:26 -> a
+    6:19:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):31:44 -> a
     void reportCallerNotSameClass() -> b
     void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
     void reportCallerNotSameNest() -> c
@@ -38721,15 +39219,15 @@
     void reportRecursiveMethod() -> v
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.t0.h:
-    com.android.tools.r8.graph.DexEncodedMethod callee -> a
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.w0.h:
     boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    com.android.tools.r8.graph.ProgramMethod context -> b
+    com.android.tools.r8.graph.ProgramMethod callee -> a
     java.io.PrintStream output -> c
     boolean reasonHasBeenReported -> d
     1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):25:25 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:28 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):25:25 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):22:28 -> <init>
     1:11:void print(java.lang.String):32:42 -> a
     12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):47:47 -> a
     13:13:void reportBlacklisted():52:52 -> a
@@ -38765,7 +39263,7 @@
     1:1:void reportRecursiveMethod():209:209 -> v
     1:1:void reportUnknownTarget():214:214 -> w
     1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> x
-com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.u0.a:
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.x0.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
@@ -38786,7 +39284,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.u0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.x0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.ProgramMethod method -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -38861,7 +39359,7 @@
     89:97:java.lang.Void visit(com.android.tools.r8.ir.code.InitClass):373:381 -> a
     89:97:java.lang.Object visit(com.android.tools.r8.ir.code.InitClass):48 -> a
     1:5:void processCode():202:206 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.u0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.x0.b:
     1:1:void <init>():81:81 -> <init>
     boolean isValidInitClass(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -38875,7 +39373,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.u0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.ir.optimize.x0.c:
     boolean isValidInitClass(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     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
@@ -38888,7 +39386,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.u0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.ir.optimize.x0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -38922,14 +39420,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.u0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.ir.optimize.x0.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.u0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.ir.optimize.x0.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.u0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.x0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -38945,9 +39443,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.u0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.x0.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.u0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.x0.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
@@ -38959,20 +39457,20 @@
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> i
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocess -> d
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> j
-    1:1:void <clinit>():98:98 -> <clinit>
+    1:1:void <clinit>():99:99 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):212:212 -> <init>
     2:44:void <init>(com.android.tools.r8.graph.AppView):178:220 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):0:0 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):98 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):99 -> a
     2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):238:238 -> a
     2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):490 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):98 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):99 -> a
     3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):491:491 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):98 -> a
-    4:4:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):98:98 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$700(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):99 -> a
+    4:4:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):99:99 -> a
     5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):230:230 -> a
     6:6:void queueForProcessing(com.android.tools.r8.graph.ProgramMethod):242:242 -> a
-    6:6:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):98 -> a
+    6:6:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod):99 -> a
     7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):250:283 -> a
     41:41:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):259:259 -> a
     42:43:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):297:298 -> a
@@ -38996,23 +39494,26 @@
     144:144:void lambda$analyzeLambdaClassesStructure$6(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):411 -> a
     145:151:void removeTrivialLambdaGroups():442:448 -> a
     152:152:void lambda$removeTrivialLambdaGroups$8(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):448:448 -> a
-    153:160:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):455:462 -> a
-    161:161:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):460:460 -> a
-    162:163:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):466:467 -> a
-    164:266:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):0:102 -> a
-    164:266:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):467 -> a
-    267:284:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):468:485 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):98:98 -> b
+    153:156:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):455:458 -> a
+    157:157:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.build(com.android.tools.r8.graph.AppView):52:52 -> a
+    157:157:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):458 -> a
+    158:162:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):458:462 -> a
+    163:163:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):460:460 -> a
+    164:165:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):466:467 -> a
+    166:268:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):0:102 -> a
+    166:268:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):467 -> a
+    269:286:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):468:485 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):99:99 -> b
     2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):234:234 -> b
     3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):251:251 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):98:98 -> c
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):99:99 -> c
     2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):225:225 -> c
     3:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):254:258 -> c
-    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):98:98 -> d
+    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):99:99 -> d
     2:13:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):263:274 -> d
     14:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):269:269 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.u0.j:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.u0.k:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.x0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.x0.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.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):494:494 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):495:499 -> <init>
@@ -39025,20 +39526,20 @@
     6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):526:526 -> a
     7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):531:531 -> a
     8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):536:536 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.u0.l:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.x0.l:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):112:112 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):112:112 -> <init>
-    1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):116:116 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.u0.m:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):113:113 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):113:113 -> <init>
+    1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):117:117 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.x0.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
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():120:120 -> <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):127:129 -> <init>
-    1:34:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):139:172 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.u0.n:
+    1:1:void <clinit>():121:121 -> <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):128:130 -> <init>
+    1:33:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):140:172 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.x0.n:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
     java.util.Set typeAffectedValues -> n
@@ -39058,7 +39559,7 @@
     11:11:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):655:655 -> a
     1:42:void processCode():571:612 -> b
     43:43:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):616:616 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.u0.o:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.x0.o:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
@@ -39069,12 +39570,12 @@
     1:1:java.lang.Object apply(java.lang.Object):659:659 -> apply
     2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):670:674 -> apply
     2:6:java.lang.Object apply(java.lang.Object):659 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.u0.p:
-    1:1:void <init>():100:100 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):100:100 -> <init>
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.x0.p:
+    1:1:void <init>():101:101 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):101:101 -> <init>
     void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.u0.r:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.x0.r:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -39117,7 +39618,7 @@
     65:65:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     65:65:void accept(com.android.tools.r8.graph.DexMethodHandle):76 -> a
     66:67:void accept(com.android.tools.r8.graph.DexMethodHandle):76:77 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.u0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.x0.s.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -39130,35 +39631,35 @@
     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.u0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.x0.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):105:105 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):107:107 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):112:112 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):105 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithClassHierarchy):118:118 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.u0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.u0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.x0.s.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.x0.s.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):187:187 -> <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):198:201 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):202:202 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():192:192 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.u0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.x0.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.AppInfoWithClassHierarchy):159:159 -> <init>
     1:1:int getInstanceInitializerMaxSize(java.util.List):164:164 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):171:178 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):174:174 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.u0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.x0.s.e:
     1:1:void <init>(com.android.tools.r8.graph.AppView,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):137:137 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():152:152 -> a
     java.lang.String getLambdaKindDescriptor() -> c
     1:1:boolean equals(java.lang.Object):142:142 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.u0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.x0.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):220:221 -> <init>
     1:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):228:228 -> c
     1:1:void prepareSuperConstructorCall(int):226:226 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.u0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.x0.s.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():17:18 -> <clinit>
@@ -39190,30 +39691,30 @@
     44:44:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):34 -> b
     45:45:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):58:58 -> b
     45:45:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):34 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.u0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.x0.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):111:111 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):113:113 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):118:118 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithClassHierarchy):124:124 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.u0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.u0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.x0.s.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.x0.s.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):198:198 -> <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):209:215 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):213:213 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():203:203 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.u0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.x0.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.AppInfoWithClassHierarchy):165:165 -> <init>
     1:1:int getInstanceInitializerMaxSize(java.util.List):170:170 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):177:189 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):185:185 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.u0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.x0.s.l:
     1:1:void <init>(com.android.tools.r8.graph.AppView,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):143:143 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():158:158 -> a
     java.lang.String getLambdaKindDescriptor() -> c
     1:1:boolean equals(java.lang.Object):148:148 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.u0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.x0.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):234:237 -> <init>
@@ -39221,7 +39722,7 @@
     1:1:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):243:243 -> c
     2:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):246:246 -> c
     1:3:void prepareSuperConstructorCall(int):242:244 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.u0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.x0.s.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():17:18 -> <clinit>
@@ -39260,7 +39761,7 @@
     44:44:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):34 -> b
     45:45:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):58:58 -> b
     45:45:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):34 -> b
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.u0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.x0.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>
@@ -39269,7 +39770,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.u0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.x0.s.q:
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -39355,7 +39856,7 @@
     233:240:void accept(java.lang.Object):47 -> accept
     241:241:void accept(com.android.tools.r8.graph.DexClass):74:74 -> accept
     241:241:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.u0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.x0.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
@@ -39368,7 +39869,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.u0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.x0.s.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39402,7 +39903,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.u0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.x0.s.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():43:43 -> <clinit>
@@ -39419,11 +39920,11 @@
     1:5:com.android.tools.r8.graph.DexAnnotationSet buildAnnotations():81:85 -> b
     6:6:com.android.tools.r8.ir.conversion.SourceCode lambda$buildDirectMethods$4(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):180:180 -> b
     1:14:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():164:177 -> c
-    15:15:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> c
+    15:15:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> c
     15:15:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():177 -> c
     16:28:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():177:189 -> c
     29:38:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():187:196 -> c
-    39:39:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> c
+    39:39:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> c
     39:39:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():196 -> c
     40:40:com.android.tools.r8.graph.DexEncodedMethod[] buildDirectMethods():196:196 -> c
     1:1:com.android.tools.r8.graph.EnclosingMethodAttribute buildEnclosingMethodAttribute():65:65 -> d
@@ -39435,11 +39936,11 @@
     1:10:com.android.tools.r8.graph.DexEncodedField[] buildInstanceFields():209:218 -> f
     1:1:com.android.tools.r8.graph.DexTypeList buildInterfaces():255:255 -> g
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():97:121 -> h
-    26:26:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):234:234 -> h
+    26:26:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):231:231 -> h
     26:26:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():121 -> h
     27:46:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():116:135 -> h
     1:3:java.util.Map collectVirtualMethods():143:145 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.u0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.x0.s.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():36:36 -> <clinit>
@@ -39481,7 +39982,7 @@
     57:65:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):142 -> a
     66:66:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):243:243 -> a
     66:66:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):142 -> a
-    67:67: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
+    67:67: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):35:35 -> a
     67:67:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):243 -> a
     67:67:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):142 -> a
     68:68:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):243:243 -> a
@@ -39515,7 +40016,7 @@
     22:22:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):251 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):62:65 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):80:80 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.u0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.x0.s.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39535,7 +40036,7 @@
     java.lang.String getLambdaKindDescriptor() -> c
     1:1:int hashCode():85:85 -> hashCode
     1:21:java.lang.String toString():122:142 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.u0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.x0.s.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -39569,7 +40070,7 @@
     98:98:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):221:221 -> a
     98:98:void validateDirectMethods(com.android.tools.r8.graph.DexClass):176 -> a
     99:99:void validateDirectMethods(com.android.tools.r8.graph.DexClass):176:176 -> a
-    100:100:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():164:164 -> a
+    100:100:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():168:168 -> a
     100:100:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):228 -> a
     101:105:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):229:233 -> a
     106:106:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):221:221 -> a
@@ -39619,7 +40120,7 @@
     35:35:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):221:221 -> c
     35:35:java.lang.String validateAnnotations(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):123 -> c
     36:38:java.lang.String validateAnnotations(com.android.tools.r8.graph.AppView,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):123:125 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.u0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.x0.s.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -39636,7 +40137,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.v0.a:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.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):26:28 -> <init>
@@ -39649,48 +40150,48 @@
     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):46 -> 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):75:75 -> 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):46 -> a
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.ir.optimize.v0.b:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.b:
     com.android.tools.r8.graph.AppView appView -> a
-    1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():32:32 -> a
-    2:3: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):42:43 -> a
-    4:29:void insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):51:76 -> a
-    4:29: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):44 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.ir.optimize.v0.c:
+    1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():31:31 -> a
+    2:3: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):41:42 -> a
+    4:29:void insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):50:75 -> a
+    4:29: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):43 -> a
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.ir.optimize.y0.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
     boolean $assertionsDisabled -> e
     java.util.Set finalLibraryFields -> b
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):39:39 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView):31:60 -> <init>
-    1:2:void initializeFinalLibraryFields():64:65 -> a
-    3:3:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):67:67 -> a
-    4:4:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
-    4:4:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):67 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():130:130 -> a
-    5:5:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):69 -> a
-    6:8:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):70:72 -> a
-    9:9:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):81:81 -> a
-    10:10:boolean isModeled(com.android.tools.r8.graph.DexType):97:97 -> a
-    11:15:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):101:105 -> a
-    16:16:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):111:111 -> a
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):41:41 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView):33:62 -> <init>
+    1:2:void initializeFinalLibraryFields():66:67 -> a
+    3:3:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):69:69 -> a
+    4:4:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
+    4:4:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):69 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():134:134 -> a
+    5:5:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):71 -> a
+    6:8:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):72:74 -> a
+    9:9:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):83:83 -> a
+    10:10:boolean isModeled(com.android.tools.r8.graph.DexType):99:99 -> a
+    11:15:void register(com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection):103:107 -> a
+    16:16:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):116:116 -> a
     17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    17:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):112 -> a
-    18:22:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):113:117 -> a
-    23:25:void optimizeInvoke(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):134:136 -> a
-    23:25:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):119 -> a
-    26:28:void optimizeInvoke(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):135:137 -> a
-    26:28:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):119 -> a
-    29:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):123:124 -> a
+    17:17:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):117 -> a
+    18:22:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):118:122 -> a
+    23:25:void optimizeInvoke(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):139:141 -> a
+    23:25:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):124 -> a
+    26:28:void optimizeInvoke(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):140:142 -> a
+    26:28:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):124 -> a
+    29:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):128:129 -> a
     31:31:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    31:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):124 -> a
-    32:32:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):124:124 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.v0.d:
+    31:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):129 -> a
+    32:32:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):129:129 -> a
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.y0.d:
     com.android.tools.r8.graph.DexType getType() -> a
     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.LibraryOptimizationInfoInitializer -> com.android.tools.r8.ir.optimize.v0.e:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.ir.optimize.y0.e:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
@@ -39701,7 +40202,7 @@
     1:1:java.util.Set getModeledLibraryTypes():44:44 -> a
     2:2:void modelStaticFinalLibraryFields(java.util.Set):48:48 -> a
     2:2:void run(java.util.Set):37 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> a
     3:3:void modelStaticFinalLibraryFields(java.util.Set):49 -> a
     3:3:void run(java.util.Set):37 -> a
     4:4:void modelStaticFinalLibraryFields(java.util.Set):50:50 -> a
@@ -39719,16 +40220,16 @@
     12:15:void run(java.util.Set):39 -> a
     16:16:void modelRequireNonNullMethods():75:75 -> a
     16:16:void run(java.util.Set):40 -> a
-    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1170:1170 -> a
+    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1172:1172 -> a
     17:17:void modelRequireNonNullMethods():75 -> a
     17:17:void run(java.util.Set):40 -> a
     18:29:void modelRequireNonNullMethods():75:86 -> a
     18:29:void run(java.util.Set):40 -> a
     30:30:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):92:92 -> a
-    31:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
     31:31:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):92 -> a
     32:32:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):94:94 -> a
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.ir.optimize.v0.f:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.f:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -39750,37 +40251,37 @@
     4:4:com.android.tools.r8.graph.DexType getType():99:99 -> a
     5:39: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):109:143 -> a
     40:43:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):150:153 -> a
-com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.v0.g:
+com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.ir.optimize.y0.g:
     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.graph.DexType getType():29:29 -> a
     1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> b
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.ir.optimize.v0.h:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):37:37 -> a
     3:5:void optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):43:45 -> a
     3:5: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):38 -> a
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.ir.optimize.v0.i:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.i:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):37:37 -> a
     3:11:void optimizeRequireNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):44:52 -> a
     3:11: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):38 -> a
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.ir.optimize.v0.j:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.ir.optimize.y0.j:
     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):25:27 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():32:32 -> a
-    2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):42:42 -> a
-    3:9:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):49:55 -> a
-    3:9: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):43 -> a
-    10:33:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):67:90 -> a
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.w0.a:
+    1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getType():33:33 -> a
+    2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):43:43 -> a
+    3:9:void optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):50:56 -> a
+    3:9: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):44 -> a
+    10:33:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):68:91 -> a
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.ir.optimize.z0.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
@@ -39794,10 +40295,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.w0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.ir.optimize.z0.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.w0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.ir.optimize.z0.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
@@ -39812,7 +40313,7 @@
     37:68:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):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.w0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.ir.optimize.z0.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
@@ -39823,10 +40324,10 @@
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
     25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.w0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.ir.optimize.z0.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.w0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.ir.optimize.z0.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
@@ -39849,12 +40350,12 @@
     55:86:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):0:31 -> a
     55:86:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):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.w0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.ir.optimize.z0.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.w0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.ir.optimize.z0.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
@@ -39865,7 +40366,7 @@
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):64:64 -> a
     1:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):36:39 -> b
     5:5: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.w0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.ir.optimize.z0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -39880,7 +40381,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:4:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.w0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.ir.optimize.z0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39892,14 +40393,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.w0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.ir.optimize.z0.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.w0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.ir.optimize.z0.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
@@ -39911,7 +40412,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.w0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.ir.optimize.z0.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
@@ -39928,7 +40429,7 @@
     51:51:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):126: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.w0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.ir.optimize.z0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39940,102 +40441,95 @@
     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.x0.d:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.ir.optimize.A0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map referencedFrom -> d
     java.util.concurrent.ConcurrentHashMap candidates -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):111:111 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):105:114 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):56:56 -> a
-    2:49:void collectCandidates(com.android.tools.r8.graph.DexApplication):121:168 -> a
-    50:81:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):132:163 -> a
-    82:86:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):169:173 -> a
-    87:92:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):185:190 -> a
-    87:92:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174 -> a
-    93:96:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
-    97:110:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):220:233 -> a
-    111:124:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):230:243 -> a
-    125:143:java.util.List isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):527:545 -> a
-    125:143:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):244 -> a
-    144:177:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):246:279 -> a
-    178:186:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):385:393 -> a
-    178:186:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    187:187:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
-    187:187:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396 -> a
-    187:187:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    188:188:com.android.tools.r8.graph.DexItemFactory access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):56:56 -> a
-    188:188:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86 -> a
-    188:188:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396 -> a
-    188:188:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    189:189:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86:86 -> a
-    189:189:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396 -> a
-    189:189:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    190:190:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.DexEncodedMethod):86 -> a
-    190:190:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396 -> a
-    190:190:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    191:231:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):399:439 -> a
-    191:231:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    232:232:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):474:474 -> a
-    232:232:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):439 -> a
-    232:232:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    233:248:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):442:457 -> a
-    233:248:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    249:256:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):509:516 -> a
-    249:256:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):458 -> a
-    249:256:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    257:266:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):459:468 -> a
-    257:266:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    267:273:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):281:287 -> a
-    274:277:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):375:378 -> a
-    274:277:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    278:283:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
-    278:283:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):378 -> a
-    278:283:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    284:284:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):379:379 -> a
-    284:284:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):287 -> a
-    285:311:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):288:314 -> a
-    312:324:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):558:570 -> a
-    312:324:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):314 -> a
-    325:339:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):316:330 -> a
-    340:349:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):578:587 -> a
-    340:349:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330 -> a
-    350:384:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):332:366 -> a
-    385:385:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):295:295 -> a
-    386:411:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):479:504 -> a
-    412:412:boolean lambda$isValidInitCall$5(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):489:489 -> a
-    413:418:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):594:599 -> a
-    419:421:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):598:600 -> a
-    422:425:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):610:613 -> a
-    426:458:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):629:661 -> a
-    459:459:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):685:685 -> a
-    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$3(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):317:317 -> b
-    2:2:boolean lambda$isValidValueUser$6(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):638:638 -> b
-    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$4(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):333:333 -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.x0.a:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.x0.b:
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):110:110 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):104:113 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):55:55 -> a
+    2:49:void collectCandidates(com.android.tools.r8.graph.DexApplication):120:167 -> a
+    50:81:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):131:162 -> a
+    82:86:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):168:172 -> a
+    87:92:boolean isPinned(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):184:189 -> a
+    87:92:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):173 -> a
+    93:96:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):174:177 -> a
+    97:110:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):219:232 -> a
+    111:124:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):229:242 -> a
+    125:142:java.util.List isValidGetter(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.IRCode):523:540 -> a
+    125:142:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):243 -> a
+    143:174:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):245:276 -> a
+    175:183:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):382:390 -> a
+    175:183:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    184:184:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
+    184:184:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
+    184:184:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    185:185:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
+    185:185:boolean com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.isHostClassInitializer(com.android.tools.r8.graph.ProgramMethod):85 -> a
+    185:185:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):393 -> a
+    185:185:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    186:226:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):396:436 -> a
+    186:226:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    227:227:boolean isNonThrowingConstInstruction(com.android.tools.r8.ir.code.Instruction):471:471 -> a
+    227:227:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):436 -> a
+    227:227:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    228:243:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):439:454 -> a
+    228:243:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    244:250:boolean isValidStaticPut(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):506:512 -> a
+    244:250:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):455 -> a
+    244:250:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    251:260:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):456:465 -> a
+    251:260:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):277 -> a
+    261:267:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):279:285 -> a
+    268:271:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):373:376 -> a
+    268:271:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):285 -> a
+    272:277:boolean com.android.tools.r8.ir.code.Goto.isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
+    272:277:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):376 -> a
+    272:277:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):285 -> a
+    278:278:boolean isAllowedInHostClassInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):377:377 -> a
+    278:278:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):285 -> a
+    279:305:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):286:312 -> a
+    306:318:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):553:565 -> a
+    306:318:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):312 -> a
+    319:333:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):314:328 -> a
+    334:343:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):573:582 -> a
+    334:343:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):328 -> a
+    344:378:void examineMethodCode(com.android.tools.r8.ir.code.IRCode):330:364 -> a
+    379:379:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$2(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):293:293 -> a
+    380:405:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):476:501 -> a
+    406:406:boolean lambda$isValidInitCall$5(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):486:486 -> a
+    407:412:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):589:594 -> a
+    413:415:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):593:595 -> a
+    416:419:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):605:608 -> a
+    420:452:boolean isValidValueUser(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set,com.android.tools.r8.ir.code.Instruction):624:656 -> a
+    453:453:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):680:680 -> a
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$3(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):315:315 -> b
+    2:2:boolean lambda$isValidValueUser$6(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):633:633 -> b
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$examineMethodCode$4(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):331:331 -> c
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.ir.optimize.A0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.ir.optimize.A0.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):688:688 -> <init>
-    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):690:691 -> <init>
-    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):695:696 -> a
-    3:4:boolean registerField(com.android.tools.r8.graph.DexField):701:702 -> a
-    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):708:708 -> registerInitClass
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):743:743 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):738:738 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):718:718 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):728:728 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):723:723 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):733:733 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):713:713 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):748:748 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):753:753 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):758:758 -> registerStaticFieldWrite
-    1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):763:765 -> registerTypeReference
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.x0.c:
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):683:683 -> <init>
+    2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):685:686 -> <init>
+    1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):690:691 -> a
+    3:4:boolean registerField(com.android.tools.r8.graph.DexField):696:697 -> a
+    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):703:703 -> registerInitClass
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):738:738 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):733:733 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):713:713 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):723:723 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):718:718 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):728:728 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):708:708 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):743:743 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):748:748 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):753:753 -> registerStaticFieldWrite
+    1:3:boolean registerTypeReference(com.android.tools.r8.graph.DexType):758:760 -> registerTypeReference
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.ir.optimize.A0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -40045,26 +40539,26 @@
     com.android.tools.r8.graph.DexProgramClass candidate -> a
     java.util.concurrent.atomic.AtomicReference constructor -> f
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> h
-    1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):75:75 -> <init>
-    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):67:82 -> <init>
-    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():94:94 -> a
-    2:2:com.android.tools.r8.graph.DexType hostType():90:90 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():94 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass hostClass():94 -> a
-    4:5:com.android.tools.r8.graph.DexProgramClass hostClass():94:95 -> a
-    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():100:100 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.x0.e:
+    1:1:void <clinit>():63:63 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):74:74 -> <init>
+    2:17:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):66:81 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass hostClass():93:93 -> a
+    2:2:com.android.tools.r8.graph.DexType hostType():89:89 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass hostClass():93 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass hostClass():93 -> a
+    4:5:com.android.tools.r8.graph.DexProgramClass hostClass():93:94 -> a
+    1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():99:99 -> b
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.ir.optimize.A0.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.x0.f:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.ir.optimize.A0.f:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
-    com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> d
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet methodsToReprocess -> d
     boolean $assertionsDisabled -> l
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToBeStaticized -> h
     java.util.Map singletonFields -> i
@@ -40074,166 +40568,170 @@
     java.util.Map processingQueue -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> c
     java.util.Map hostClassInits -> g
-    1:1:void <clinit>():66:66 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):88:88 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):72:91 -> <init>
-    1:1:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):109:109 -> a
-    2:5:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):113:116 -> a
-    6:6:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):122:122 -> a
-    7:16:java.util.Map finalEligibilityCheck():152:161 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> a
-    17:17:java.util.Map finalEligibilityCheck():162 -> a
-    18:124:java.util.Map finalEligibilityCheck():163:269 -> a
-    125:138:java.util.Map finalEligibilityCheck():268:281 -> a
-    139:147:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):207:215 -> a
-    148:153:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):214:219 -> a
-    154:161:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):244:251 -> a
-    162:189:void prepareCandidates(java.util.Map):290:317 -> a
-    190:193:boolean validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):326:329 -> a
-    190:193:void prepareCandidates(java.util.Map):318 -> a
-    194:197:void prepareCandidates(java.util.Map):319:322 -> a
-    198:200:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):304:306 -> a
-    201:205:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):337:341 -> a
-    206:206:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):340:340 -> a
-    207:207:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):339:339 -> a
-    208:208:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):341:341 -> a
-    209:220:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):357:368 -> a
-    221:224:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod):360:360 -> a
-    225:228:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor):377:380 -> a
-    229:229:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):378:378 -> a
-    230:230:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):384:384 -> a
-    231:231:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):389:389 -> a
-    232:239:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):390:390 -> a
-    240:242:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):457:459 -> a
-    243:247:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):458:462 -> a
-    248:248:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):461:461 -> a
-    249:269:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):490:510 -> a
-    270:274:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):517:521 -> a
-    275:292:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):520:537 -> a
-    293:320:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):576:603 -> a
-    321:327:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):611:617 -> a
-    328:345:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):616:633 -> a
-    346:355:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):637:646 -> a
-    356:356:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
-    356:356:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):646 -> a
-    357:364:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):647:654 -> a
-    365:365:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> a
-    365:365:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653 -> a
-    366:366:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    366:366:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> a
-    366:366:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653 -> a
-    367:367:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):713:713 -> a
-    368:368:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> a
-    368:368:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):715 -> a
-    369:371:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):715:717 -> a
-    372:372:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> a
-    372:372:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):719 -> a
-    373:373:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):719:719 -> a
-    374:377:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):767:770 -> a
-    378:378:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):769:769 -> a
-    379:379:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):770:770 -> a
-    380:380:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):840:840 -> a
-    381:381:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> a
-    381:381:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):841 -> a
-    382:383:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):842:843 -> a
-    384:384:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):841:841 -> a
-    1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):98:125 -> b
-    29:40:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():725:736 -> b
-    29:40:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    41:41:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> b
-    41:41:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():737 -> b
-    41:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    42:50:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():737:745 -> b
-    42:50:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():90:90 -> b
-    51:51:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():748 -> b
-    51:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    52:53:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():749:750 -> b
-    52:53:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    54:54:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():750 -> b
-    54:54:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    55:57:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():750:752 -> b
-    55:57:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    58:96:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):780:818 -> b
-    58:96:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():754 -> b
-    58:96:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    97:97:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> b
-    97:97:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):820 -> b
-    97:97:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():754 -> b
-    97:97:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    98:98:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):820:820 -> b
-    98:98:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():754 -> b
-    98:98:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    99:115:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):819:835 -> b
-    99:115:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():754 -> b
-    99:115:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    116:117:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():760:761 -> b
-    116:117:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):129 -> b
-    118:132:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134:148 -> b
-    133:136:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):139:142 -> b
-    137:137:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):198:198 -> b
-    138:149:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):400:411 -> b
-    150:150:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> b
-    150:150:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):411 -> b
-    151:158:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):411:418 -> b
-    159:159:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):41:41 -> b
-    159:159:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):418 -> b
-    160:160:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):419:419 -> b
-    161:161:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):293:293 -> b
-    161:161:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):420 -> b
-    162:168:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):423:429 -> b
-    169:169:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):293:293 -> b
-    169:169:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):430 -> b
-    170:172:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):432:434 -> b
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> b
-    173:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):435 -> b
-    174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):435:435 -> b
-    175:175:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> b
-    175:175:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):434 -> b
-    176:176:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
-    176:176:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> b
-    176:176:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):434 -> b
-    177:177:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):293:293 -> b
-    177:177:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):437 -> b
-    178:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):443:443 -> b
-    1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):221:221 -> c
-    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):447:447 -> c
-    1:26:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):454:479 -> d
-    27:27:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):293:293 -> d
-    27:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):480 -> d
-    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):483:483 -> d
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):91:91 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.ir.conversion.IRConverter):75:94 -> <init>
+    1:1:void lambda$run$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo):112:112 -> a
+    2:5:void lambda$run$1(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):116:119 -> a
+    6:6:void lambda$run$2(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):125:125 -> a
+    7:16:java.util.Map finalEligibilityCheck():155:164 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> a
+    17:17:java.util.Map finalEligibilityCheck():165 -> a
+    18:87:java.util.Map finalEligibilityCheck():166:235 -> a
+    88:88:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.build(com.android.tools.r8.graph.AppView):52:52 -> a
+    88:88:java.util.Map finalEligibilityCheck():235 -> a
+    89:128:java.util.Map finalEligibilityCheck():236:275 -> a
+    129:142:java.util.Map finalEligibilityCheck():274:287 -> a
+    143:151:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):210:218 -> a
+    152:157:com.android.tools.r8.utils.TraversalContinuation lambda$finalEligibilityCheck$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):217:222 -> a
+    158:165:boolean lambda$finalEligibilityCheck$7(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction):250:257 -> a
+    166:186:void prepareCandidates(java.util.Map):296:316 -> a
+    187:202:void prepareCandidates(java.util.Map):308:323 -> a
+    203:206:boolean validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):332:335 -> a
+    203:206:void prepareCandidates(java.util.Map):324 -> a
+    207:210:void prepareCandidates(java.util.Map):325:328 -> a
+    211:213:boolean lambda$prepareCandidates$8(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):310:312 -> a
+    214:218:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):343:347 -> a
+    219:219:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):346:346 -> a
+    220:220:void enqueueMethodsWithCodeOptimizations(java.lang.Iterable,java.util.function.Consumer):345:345 -> a
+    221:221:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder lambda$enqueueMethodsWithCodeOptimizations$9(com.android.tools.r8.graph.DexEncodedMethod):347:347 -> a
+    222:235:void processMethodsConcurrently(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):363:376 -> a
+    236:239:void lambda$processMethodsConcurrently$10(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):367:367 -> a
+    240:243:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):386:389 -> a
+    244:244:void lambda$forEachMethod$11(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,java.util.function.BiConsumer):387:387 -> a
+    245:245:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):393:393 -> a
+    246:246:java.util.function.BiConsumer collectOptimizationInfo(com.android.tools.r8.ir.optimize.info.OptimizationFeedback):398:398 -> a
+    247:254:void lambda$collectOptimizationInfo$12(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):399:399 -> a
+    255:257:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):466:468 -> a
+    258:262:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):467:471 -> a
+    263:263:boolean lambda$rewriteReferences$13(com.android.tools.r8.ir.code.Instruction):470:470 -> a
+    264:284:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):499:519 -> a
+    285:289:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):526:530 -> a
+    290:307:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):529:546 -> a
+    308:335:boolean testAndCollectPhisComposedOfSameMember(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember,java.util.Set):585:612 -> a
+    336:342:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):620:626 -> a
+    343:360:void fixupStaticizedFieldUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMember):625:642 -> a
+    361:370:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):646:655 -> a
+    371:371:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> a
+    371:371:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):655 -> a
+    372:379:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656:663 -> a
+    380:380:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> a
+    380:380:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):662 -> a
+    381:381:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    381:381:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> a
+    381:381:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):662 -> a
+    382:382:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):722:722 -> a
+    383:383:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> a
+    383:383:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):724 -> a
+    384:386:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):724:726 -> a
+    387:387:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> a
+    387:387:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728 -> a
+    388:388:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728:728 -> a
+    389:392:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):776:779 -> a
+    393:393:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):778:778 -> a
+    394:394:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):779:779 -> a
+    395:395:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):853:853 -> a
+    396:396:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> a
+    396:396:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):854 -> a
+    397:398:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):855:856 -> a
+    399:399:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):854:854 -> a
+    1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):101:128 -> b
+    29:40:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():734:745 -> b
+    29:40:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    41:41:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> b
+    41:41:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():746 -> b
+    41:41:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    42:50:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():746:754 -> b
+    42:50:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():89:89 -> b
+    51:51:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():757 -> b
+    51:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    52:53:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():758:759 -> b
+    52:53:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    54:54:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():759 -> b
+    54:54:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    55:57:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():759:761 -> b
+    55:57:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    58:100:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):789:831 -> b
+    58:100:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():763 -> b
+    58:100:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    101:101:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> b
+    101:101:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):834 -> b
+    101:101:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():763 -> b
+    101:101:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    102:102:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):834:834 -> b
+    102:102:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():763 -> b
+    102:102:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    103:119:void moveMembersIntoHost(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):833:849 -> b
+    103:119:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():763 -> b
+    103:119:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    120:121:com.android.tools.r8.utils.collections.ProgramMethodSet staticizeMethodSymbols():769:770 -> b
+    120:121:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):132 -> b
+    122:136:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):137:151 -> b
+    137:140:void lambda$run$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):142:145 -> b
+    141:141:boolean lambda$finalEligibilityCheck$4(com.android.tools.r8.graph.DexEncodedMethod):201:201 -> b
+    142:153:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):409:420 -> b
+    154:154:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> b
+    154:154:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):420 -> b
+    155:162:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):420:427 -> b
+    163:163:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):42:42 -> b
+    163:163:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):427 -> b
+    164:164:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):428:428 -> b
+    165:165:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):292:292 -> b
+    165:165:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):429 -> b
+    166:172:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):432:438 -> b
+    173:173:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):292:292 -> b
+    173:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):439 -> b
+    174:176:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):441:443 -> b
+    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1095:1095 -> b
+    177:177:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444 -> b
+    178:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444:444 -> b
+    179:179:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> b
+    179:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):443 -> b
+    180:180:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
+    180:180:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> b
+    180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):443 -> b
+    181:181:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):292:292 -> b
+    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):446 -> b
+    182:182:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):452:452 -> b
+    1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):224:224 -> c
+    2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):456:456 -> c
+    1:26:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):463:488 -> d
+    27:27:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):292:292 -> d
+    27:27:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):489 -> d
+    28:28:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):492:492 -> d
     29:29:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> d
-    29:29:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):660 -> d
-    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    30:43:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):661:674 -> d
-    30:43:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    44:46:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):673:675 -> d
-    44:46:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    47:47:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):672:672 -> d
-    47:47:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
+    29:29:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):669 -> d
+    29:29:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    30:43:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):670:683 -> d
+    30:43:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    44:46:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):682:684 -> d
+    44:46:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    47:47:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):681:681 -> d
+    47:47:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
     48:48:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    48:48:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):670 -> d
-    48:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    49:53:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):681:685 -> d
-    49:53:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
+    48:48:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):679 -> d
+    48:48:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    49:53:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):690:694 -> d
+    49:53:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
     54:54:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    54:54:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):685 -> d
-    54:54:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    55:58:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):690:693 -> d
-    55:58:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    59:59:com.android.tools.r8.graph.DexItemFactory factory():848:848 -> d
-    59:59:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):695 -> d
-    59:59:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    60:68:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):695:703 -> d
-    60:68:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    69:71:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):702:704 -> d
-    69:71:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
-    72:76:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):701:705 -> d
-    72:76:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
+    54:54:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):694 -> d
+    54:54:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    55:58:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):699:702 -> d
+    55:58:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    59:59:com.android.tools.r8.graph.DexItemFactory factory():861:861 -> d
+    59:59:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):704 -> d
+    59:59:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    60:68:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):704:712 -> d
+    60:68:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    69:71:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):711:713 -> d
+    69:71:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
+    72:76:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):710:714 -> d
+    72:76:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
     77:77:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
-    77:77:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):705 -> d
-    77:77:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):484 -> d
+    77:77:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):714 -> d
+    77:77:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):493 -> d
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.a:
     boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType) -> a
     boolean isBuilderType(com.android.tools.r8.graph.DexType) -> a
@@ -40263,76 +40761,76 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfLengthOfPartialAppendChains -> r
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfLengthOfPartialResult -> s
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis analysis -> d
-    1:1:void <clinit>():79:79 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):103:103 -> <init>
-    2:31:void <init>(com.android.tools.r8.graph.AppView):88:117 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$1000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> a
-    2:4:void logResults():122:124 -> a
-    5:8:void logResults():123:126 -> a
-    9:12:void logResults():125:128 -> a
-    13:16:void logResults():127:130 -> a
-    17:20:void logResults():129:132 -> a
-    21:24:void logResults():131:134 -> a
-    25:28:void logResults():133:136 -> a
-    29:32:void logResults():135:138 -> a
-    33:61:void logResults():137:165 -> a
-    62:64:void lambda$logResults$0(java.lang.Integer,java.lang.Integer):144:144 -> a
-    65:80:void computeTrivialStringConcatenation(com.android.tools.r8.ir.code.IRCode):173:188 -> a
-    81:81:boolean lambda$computeTrivialStringConcatenation$4(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):180:180 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$1100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> b
-    2:4:void lambda$logResults$1(java.lang.Integer,java.lang.Integer):151:151 -> b
-    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo access$1200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> c
-    2:4:void lambda$logResults$2(java.lang.Integer,java.lang.Integer):159:159 -> c
-    1:1:int access$1308(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> d
-    2:4:void lambda$logResults$3(java.lang.Integer,java.lang.Integer):166:166 -> d
-    1:1:int access$1408(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> e
-    1:1:int access$1508(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> f
-    1:1:int access$1608(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> g
-    1:1:int access$1708(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> h
-    1:1:int access$1808(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> i
-    1:1:int access$1908(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> j
-    1:1:int access$2008(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> k
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> l
-    1:1:int access$408(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> m
-    1:1:int access$508(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> n
-    1:1:com.android.tools.r8.graph.DexItemFactory access$700(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> o
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$800(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> p
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$900(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):79:79 -> q
+    1:1:void <clinit>():80:80 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):104:104 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.AppView):89:118 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$1000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> a
+    2:4:void logResults():123:125 -> a
+    5:8:void logResults():124:127 -> a
+    9:12:void logResults():126:129 -> a
+    13:16:void logResults():128:131 -> a
+    17:20:void logResults():130:133 -> a
+    21:24:void logResults():132:135 -> a
+    25:28:void logResults():134:137 -> a
+    29:32:void logResults():136:139 -> a
+    33:61:void logResults():138:166 -> a
+    62:64:void lambda$logResults$0(java.lang.Integer,java.lang.Integer):145:145 -> a
+    65:80:void computeTrivialStringConcatenation(com.android.tools.r8.ir.code.IRCode):174:189 -> a
+    81:81:boolean lambda$computeTrivialStringConcatenation$4(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):181:181 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$1100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> b
+    2:4:void lambda$logResults$1(java.lang.Integer,java.lang.Integer):152:152 -> b
+    1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo access$1200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> c
+    2:4:void lambda$logResults$2(java.lang.Integer,java.lang.Integer):160:160 -> c
+    1:1:int access$1308(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> d
+    2:4:void lambda$logResults$3(java.lang.Integer,java.lang.Integer):167:167 -> d
+    1:1:int access$1408(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> e
+    1:1:int access$1508(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> f
+    1:1:int access$1608(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> g
+    1:1:int access$1708(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> h
+    1:1:int access$1808(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> i
+    1:1:int access$1908(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> j
+    1:1:int access$2008(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> k
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> l
+    1:1:int access$408(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> m
+    1:1:int access$508(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> n
+    1:1:com.android.tools.r8.graph.DexItemFactory access$700(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> o
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$800(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> p
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap access$900(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):80:80 -> q
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1 -> com.android.tools.r8.ir.optimize.string.b$a:
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.ir.optimize.string.b$b:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState previous -> a
     java.util.Set nexts -> c
     java.lang.String addition -> b
-    1:4:void <init>():971:974 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createRoot():978:978 -> a
-    2:8:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createChild(java.lang.String):982:988 -> a
+    1:4:void <init>():972:975 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createRoot():979:979 -> a
+    2:8:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState createChild(java.lang.String):983:989 -> a
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.ir.optimize.string.b$c:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():792:792 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):792:792 -> <init>
-    1:2:boolean isBuilderType(com.android.tools.r8.graph.DexType):796:797 -> a
-    3:4:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):802:803 -> a
-    5:23:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):827:845 -> a
-    24:24:boolean canHandleArgumentType(com.android.tools.r8.graph.DexType):860:860 -> a
-    24:24:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):846 -> a
-    25:27:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):853:855 -> a
-    1:3:boolean isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):814:816 -> b
-    4:5:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):821:822 -> b
-    1:2:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):808:809 -> c
+    1:1:void <clinit>():793:793 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):793:793 -> <init>
+    1:2:boolean isBuilderType(com.android.tools.r8.graph.DexType):797:798 -> a
+    3:4:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):803:804 -> a
+    5:23:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):828:846 -> a
+    24:24:boolean canHandleArgumentType(com.android.tools.r8.graph.DexType):861:861 -> a
+    24:24:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):847 -> a
+    25:27:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):854:856 -> a
+    1:3:boolean isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):815:817 -> b
+    4:5:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):822:823 -> b
+    1:2:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):809:810 -> c
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.b$d:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():864:864 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1):864:864 -> <init>
-    2:5:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value):868:871 -> <init>
-    1:1:void logEscapingRoute(boolean):876:876 -> 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):886:895 -> isLegitimateEscapeRoute
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> 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):895 -> isLegitimateEscapeRoute
-    12:76:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):896:960 -> isLegitimateEscapeRoute
-    77:77:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):887:887 -> isLegitimateEscapeRoute
+    1:1:void <clinit>():865:865 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$1):865:865 -> <init>
+    2:5:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value):869:872 -> <init>
+    1:1:void logEscapingRoute(boolean):877:877 -> 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.ProgramMethod):887:896 -> isLegitimateEscapeRoute
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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.ProgramMethod):896 -> isLegitimateEscapeRoute
+    12:76:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):897:961 -> isLegitimateEscapeRoute
+    77:77:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):888:888 -> isLegitimateEscapeRoute
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.ir.optimize.string.b$e:
     java.util.Map builderStates -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap builderToStringCounts -> b
@@ -40341,64 +40839,64 @@
     java.util.Set simplifiedBuilders -> e
     com.android.tools.r8.ir.code.IRCode code -> a
     boolean $assertionsDisabled -> g
-    1:1:void <clinit>():191:191 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):205:205 -> <init>
-    2:373:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):203:574 -> <init>
-    374:374:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
-    1:26:java.util.Set findAllLocalBuilders():217:242 -> a
-    1:26:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    27:29:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):256:258 -> a
-    27:29:java.util.Set findAllLocalBuilders():243 -> a
-    27:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    30:39:java.util.Set findAllLocalBuilders():243:252 -> a
-    30:39:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    40:48:void collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):263:271 -> a
-    49:72:boolean canBeOptimized(com.android.tools.r8.ir.code.Value):279:302 -> a
-    49:72:boolean access$2100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):191 -> a
-    73:73:java.util.Map createBuilderState(com.android.tools.r8.ir.code.Value):311:311 -> a
-    74:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):345:423 -> a
-    74:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    153:182:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):434:463 -> a
-    183:190:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState findDominantState(com.android.tools.r8.ir.code.DominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction):521:528 -> a
-    191:210:void logHistogramOfChains(java.util.List,boolean):536:555 -> a
-    211:227:void logHistogramOfChains(java.util.List,boolean):550:566 -> a
-    228:228:void logHistogramOfChains(java.util.List,boolean):561:561 -> a
-    229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:578 -> a
+    1:1:void <clinit>():192:192 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
+    2:373:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):204:575 -> <init>
+    374:374:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):207:207 -> <init>
+    1:26:java.util.Set findAllLocalBuilders():218:243 -> a
+    1:26:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):192 -> a
+    27:29:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):257:259 -> a
+    27:29:java.util.Set findAllLocalBuilders():244 -> a
+    27:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):192 -> a
+    30:39:java.util.Set findAllLocalBuilders():244:253 -> a
+    30:39:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):192 -> a
+    40:48:void collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):264:272 -> a
+    49:72:boolean canBeOptimized(com.android.tools.r8.ir.code.Value):280:303 -> a
+    49:72:boolean access$2100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,com.android.tools.r8.ir.code.Value):192 -> a
+    73:73:java.util.Map createBuilderState(com.android.tools.r8.ir.code.Value):312:312 -> a
+    74:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):346:424 -> a
+    74:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):192 -> a
+    153:182:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):435:464 -> a
+    183:190:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState findDominantState(com.android.tools.r8.ir.code.DominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction):522:529 -> a
+    191:210:void logHistogramOfChains(java.util.List,boolean):537:556 -> a
+    211:227:void logHistogramOfChains(java.util.List,boolean):551:567 -> a
+    228:228:void logHistogramOfChains(java.util.List,boolean):562:562 -> a
+    229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):578:579 -> a
     231:1245:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    231:1245:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):578 -> a
-    1246:1281:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579:614 -> a
-    1282:1286:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):613:617 -> a
+    231:1245:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579 -> a
+    1246:1281:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):580:615 -> a
+    1282:1286:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):614:618 -> a
     1287:1287:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1287:1287:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):616 -> a
-    1288:1289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):618:619 -> a
-    1290:1294:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
-    1295:1299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):592:596 -> a
+    1287:1287:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):617 -> a
+    1288:1289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):619:620 -> a
+    1290:1294:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):591:595 -> a
+    1295:1299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:597 -> a
     1300:1300:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1300:1300:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):595 -> a
-    1301:1326:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):598:623 -> a
+    1300:1300:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):596 -> a
+    1301:1326:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):599:624 -> a
     1327:1327:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    1327:1327:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):623 -> a
-    1328:1328:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):623:623 -> a
-    1329:1355:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):629:655 -> a
-    1329:1355:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):580 -> a
-    1356:1401:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):667:712 -> a
-    1402:1405:int estimateSizeReduction(java.util.List):719:722 -> a
-    1402:1405:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):713 -> a
-    1406:1406:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):714:714 -> a
-    1407:1413:void removeTrivialBuilders():729:735 -> a
+    1327:1327:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):624 -> a
+    1328:1328:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):624:624 -> a
+    1329:1355:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):630:656 -> a
+    1329:1355:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):581 -> a
+    1356:1401:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):668:713 -> a
+    1402:1405:int estimateSizeReduction(java.util.List):720:723 -> a
+    1402:1405:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):714 -> a
+    1406:1406:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):715:715 -> a
+    1407:1413:void removeTrivialBuilders():730:736 -> a
     1414:2428:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    1414:2428:void removeTrivialBuilders():735 -> a
-    2429:2441:void removeTrivialBuilders():736:748 -> a
+    1414:2428:void removeTrivialBuilders():736 -> a
+    2429:2441:void removeTrivialBuilders():737:749 -> a
     2442:3456:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    2442:3456:void removeTrivialBuilders():748 -> a
-    3457:3486:void removeTrivialBuilders():749:778 -> a
+    2442:3456:void removeTrivialBuilders():749 -> a
+    3457:3486:void removeTrivialBuilders():750:779 -> a
     3487:4501:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1014 -> a
-    3487:4501:void removeTrivialBuilders():778 -> a
-    4502:4511:void removeTrivialBuilders():779:788 -> a
-    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
-    2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):471:509 -> b
-    1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):316:316 -> c
-    1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):311:311 -> d
+    3487:4501:void removeTrivialBuilders():779 -> a
+    4502:4511:void removeTrivialBuilders():780:789 -> a
+    1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):192:192 -> b
+    2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):472:510 -> b
+    1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
+    1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
 com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.ir.optimize.string.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -40410,102 +40908,102 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfLengthOfDeferredNames -> h
     int numberOfSimplifiedOperations -> d
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> c
-    1:1:void <clinit>():47:47 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.AppView):53:73 -> <init>
-    1:3:void logResult():78:80 -> a
-    4:7:void logResult():79:82 -> a
-    8:34:void logResult():81:107 -> a
-    35:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
-    38:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
-    41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):133:136 -> a
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.AppView):54:74 -> <init>
+    1:3:void logResult():79:81 -> a
+    4:7:void logResult():80:83 -> a
+    8:34:void logResult():82:108 -> a
+    35:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):87:87 -> a
+    38:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):101:101 -> a
+    41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):134:137 -> a
     45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
-    46:94:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:186 -> a
-    95:99:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:189 -> a
+    45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138 -> a
+    46:94:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):139:187 -> a
+    95:99:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):186:190 -> a
     100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    100:100:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):188 -> a
-    101:114:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):190:203 -> a
-    115:118:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):202:205 -> a
+    100:100:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189 -> a
+    101:114:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):191:204 -> a
+    115:118:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:206 -> a
     119:119:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    119:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):205 -> a
-    120:179:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):206:265 -> a
+    119:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):206 -> a
+    120:179:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):207:266 -> a
     180:180:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    180:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):266 -> a
-    181:188:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268:275 -> a
+    180:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):267 -> a
+    181:188:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):269:276 -> a
     189:189:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    189:189:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):276 -> a
-    190:198:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278:286 -> a
+    189:189:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):277 -> a
+    190:198:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279:287 -> a
     199:199:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1115:1115 -> a
-    199:199:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):287 -> a
-    200:200:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):290:290 -> a
+    199:199:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):288 -> a
+    200:200:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):291:291 -> a
     201:201:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    201:201:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):291 -> a
-    202:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):294:295 -> a
+    201:201:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292 -> a
+    202:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):295:296 -> a
     204:204:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    204:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):295 -> a
-    205:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):295:295 -> a
-    206:209:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):216:219 -> a
-    210:210:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> a
-    211:211:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):239:239 -> a
-    212:215:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302:305 -> a
+    204:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296 -> a
+    205:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:296 -> a
+    206:209:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):217:220 -> a
+    210:210:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):234:234 -> a
+    211:211:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):240:240 -> a
+    212:215:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):303:306 -> a
     216:216:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> a
-    216:216:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):306 -> a
-    217:258:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):307:348 -> a
-    259:259:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    259:259:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):351 -> a
-    260:317:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):356:413 -> a
-    318:319:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):394:395 -> a
+    216:216:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):307 -> a
+    217:258:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308:349 -> a
+    259:259:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    259:259:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):352 -> a
+    260:317:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):357:414 -> a
+    318:319:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):395:396 -> a
     320:320:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    320:320:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):396 -> a
-    321:349:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):416:444 -> a
-    350:352:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):443:445 -> a
+    320:320:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397 -> a
+    321:349:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):417:445 -> a
+    350:352:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444:446 -> a
     353:353:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    353:353:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446 -> a
-    354:360:void logHistogramOfNames(com.android.tools.r8.graph.DexString):472:478 -> a
-    354:360:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
-    361:361:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):449:449 -> a
+    353:353:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    354:360:void logHistogramOfNames(com.android.tools.r8.graph.DexString):473:479 -> a
+    354:360:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448 -> a
+    361:361:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450:450 -> a
     362:362:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    362:362:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):450 -> a
-    363:371:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):493:501 -> a
-    363:371:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
-    372:373:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456:457 -> a
+    362:362:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
+    363:371:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):494:502 -> a
+    363:371:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):452 -> a
+    372:373:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):457:458 -> a
     374:374:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    374:374:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):457 -> a
-    375:375:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):457:457 -> a
-    376:381:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):483:488 -> a
-    1:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
-    4:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
-    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):223:223 -> b
-    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> b
-    9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):243:243 -> b
-    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):462:467 -> b
-    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):509:509 -> b
+    374:374:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458 -> a
+    375:375:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):458:458 -> a
+    376:381:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):484:489 -> a
+    1:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):94:94 -> b
+    4:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):109:109 -> b
+    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):224:224 -> b
+    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):236:236 -> b
+    9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):244:244 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):463:468 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):510:510 -> b
     17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1014:1014 -> b
-    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):510 -> b
-    18:37:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):511:530 -> b
-    38:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):529:532 -> b
+    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):511 -> b
+    18:37:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):512:531 -> b
+    38:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):530:533 -> b
     42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
-    42:42:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):533 -> b
-    43:80:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):534:571 -> b
+    42:42:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):534 -> b
+    43:80:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):535:572 -> b
     81:81:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    81:81:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):571 -> b
-    82:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):571:571 -> b
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):225:225 -> c
-    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):237:237 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):241:241 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):245:245 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):247:247 -> f
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):249:249 -> g
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):227:227 -> h
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> i
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> j
+    81:81:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):572 -> b
+    82:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):572:572 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):226:226 -> c
+    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):238:238 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):242:242 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):246:246 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):248:248 -> f
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):250:250 -> g
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):228:228 -> h
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):230:230 -> i
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):232:232 -> j
 com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.c:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
-    1:1:void <clinit>():578:578 -> <clinit>
-    1:1:void <init>():581:581 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():584:584 -> a
-    1:21: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):593:613 -> isLegitimateEscapeRoute
+    1:1:void <clinit>():579:579 -> <clinit>
+    1:1:void <init>():582:582 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():585:585 -> a
+    1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):594:614 -> isLegitimateEscapeRoute
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.ir.regalloc.a:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -40571,123 +41069,303 @@
     285:286:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> a
     285:286:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):614 -> a
     287:289:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):605:607 -> a
-    290:290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    290:290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     290:290:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     290:290:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607 -> a
     291:291:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607:607 -> a
     292:292:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    293:300:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):764:771 -> a
-    301:339:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):983:1021 -> a
-    340:341:void lambda$invariantsHold$3(java.util.TreeSet,int):991:992 -> a
-    342:348:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1175:1181 -> a
-    349:349:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    349:349:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1182 -> a
-    350:350:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1183 -> a
-    351:361:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1190 -> a
-    362:365:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1238:1241 -> a
-    362:365:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    366:366:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    366:366:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1245 -> a
-    366:366:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    367:367:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1244:1244 -> a
-    367:367:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    368:368:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1194:1194 -> a
-    369:382:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1192:1205 -> a
-    383:383:int getFreeConsecutiveRegisters(int):2972:2972 -> a
-    383:383:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
-    384:385:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1209 -> a
-    386:391:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1048 -> a
-    386:391:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    392:392:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1047:1047 -> a
-    392:392:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    393:393:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1046:1046 -> a
-    393:393:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    394:407:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1211:1224 -> a
-    408:432:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1207:1231 -> a
-    433:452:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1267:1286 -> a
-    453:460:boolean registersAreFreeAndConsecutive(int,boolean):3028:3035 -> a
-    453:460:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1286 -> a
-    461:486:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1287:1312 -> a
-    487:517:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1328:1358 -> a
-    518:518:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    518:518:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1359 -> a
-    519:535:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1366:1382 -> a
-    536:542:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1831:1837 -> a
-    543:555:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> a
-    543:555:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1838 -> a
-    556:556:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1842:1842 -> a
-    557:561:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> a
-    557:561:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1843 -> a
-    562:564:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
-    562:564:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1846 -> a
-    565:566:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1854:1855 -> a
-    567:597:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1860:1890 -> a
-    567:597:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1856 -> a
-    598:610:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1911:1923 -> a
-    611:616:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1941:1946 -> a
-    617:629:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1961:1973 -> a
-    630:632:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2109:2111 -> a
-    633:633:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2168:2168 -> a
-    634:634:boolean atLeastOneOfRegistersAreTaken(int,boolean):3125:3125 -> a
-    634:634:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169 -> a
-    635:681:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169:2215 -> a
-    682:704:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2283:2305 -> a
-    682:704:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
-    705:705:int toGapPosition(int):1394:1394 -> a
-    705:705:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2305 -> a
-    705:705:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
-    706:719:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2305:2318 -> a
-    706:719:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
-    720:720:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219:2219 -> a
-    721:728:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2232:2239 -> a
-    721:728:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220 -> a
-    729:756:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2246:2273 -> a
-    729:756:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2222 -> a
-    757:758:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2227:2228 -> a
-    759:761: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):2327:2329 -> a
-    762:762:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
-    762:762: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
-    763:770: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
-    771:806: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
-    807:807:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    807:807:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
-    807:807: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
-    808:814: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
-    815:866:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2520:2571 -> a
-    867:873:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2568:2574 -> a
-    874:874:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    874:874:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574 -> a
-    875:882:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2581 -> a
-    883:883:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    883:883:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
-    883:883:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581 -> a
-    884:921:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581:2618 -> a
-    922:923:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2645:2646 -> a
-    922:923:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2622 -> a
-    924:941:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2619:2636 -> a
-    942:964:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2722:2744 -> a
-    965:965:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2766:2766 -> a
-    966:970:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2871:2875 -> a
-    966:970:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2766 -> a
-    971:1004:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2800 -> a
-    1005:1006:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():801:802 -> a
-    1005:1006:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802 -> a
-    1007:1007:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803:2803 -> a
-    1008:1009:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2751:2752 -> a
-    1008:1009:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803 -> a
-    1010:1011:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804:2805 -> a
-    1012:1015:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2757:2760 -> a
-    1012:1015:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2806 -> a
-    1016:1040:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2808:2832 -> a
-    1041:1067:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2840:2866 -> a
-    1041:1067:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2833 -> a
-    1068:1068:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2774:2774 -> a
-    1069:1113:int getFreeConsecutiveRegisters(int,boolean):2976:3020 -> a
-    1114:1125:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2982:2993 -> a
-    1126:1129:int getNextFreeRegister(java.util.Iterator):3044:3047 -> a
-    1130:1142:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3051:3063 -> a
-    1143:1154:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3069:3080 -> a
-    1155:1155:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3175:3175 -> a
+    293:293:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645:645 -> a
+    294:305:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):778:789 -> a
+    294:305:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):648 -> a
+    306:306:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649:649 -> a
+    307:315:void pinArgumentRegisters():2945:2953 -> a
+    307:315:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
+    316:316:void pinArgumentRegisters():2950:2950 -> a
+    316:316:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
+    317:378:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):826:887 -> a
+    317:378:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    379:379:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    379:379:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> a
+    379:379:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    380:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):893:914 -> a
+    380:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    402:408:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1060 -> a
+    402:408:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
+    402:408:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    409:409:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    409:409:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1060 -> a
+    409:409:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
+    409:409:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    410:411:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1061:1062 -> a
+    410:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
+    410:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    412:418:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1073:1079 -> a
+    412:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
+    412:418:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    419:419:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    419:419:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> a
+    419:419:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
+    419:419:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    420:425:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1080:1085 -> a
+    420:425:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
+    420:425:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    426:426:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    426:426:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> a
+    426:426:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
+    426:426:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    427:427:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> a
+    427:427:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
+    427:427:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    428:493:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1101:1166 -> a
+    428:493:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> a
+    428:493:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    494:543:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923:972 -> a
+    494:543:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    544:556:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1608:1620 -> a
+    544:556:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    544:556:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    557:559:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    557:559:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1621 -> a
+    557:559:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    557:559:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    560:616:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1626:1682 -> a
+    560:616:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    560:616:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    617:617:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    617:617:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1683 -> a
+    617:617:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    617:617:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    618:622:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1684:1688 -> a
+    618:622:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    618:622:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    623:623:int toInstructionPosition(int):1390:1390 -> a
+    623:623:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1688 -> a
+    623:623:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    623:623:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    624:635:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1693:1704 -> a
+    624:635:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    624:635:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    636:644:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1027:1035 -> a
+    636:644:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    636:644:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    636:644:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    645:673:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1783:1811 -> a
+    645:673:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1707 -> a
+    645:673:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    645:673:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    674:702:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1713:1741 -> a
+    674:702:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    674:702:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    703:705:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    703:705:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    703:705:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    703:705:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    706:706:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1743:1743 -> a
+    706:706:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    706:706:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    707:725:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1981:1999 -> a
+    707:725:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    707:725:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    707:725:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    726:735:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2007 -> a
+    726:735:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    726:735:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    726:735:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    736:736:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    736:736:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2008 -> a
+    736:736:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    736:736:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    736:736:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    737:809:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2009:2081 -> a
+    737:809:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    737:809:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    737:809:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    810:817:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1255:1262 -> a
+    810:817:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083 -> a
+    810:817:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    810:817:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    810:817:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    818:818:void increaseCapacity(int):2959:2959 -> a
+    818:818:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1262 -> a
+    818:818:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083 -> a
+    818:818:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    818:818:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    818:818:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    819:821:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    819:821:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
+    819:821:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    819:821:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    819:821:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    822:828:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2085:2091 -> a
+    822:828:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    822:828:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    822:828:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    829:829:void increaseCapacity(int):2959:2959 -> a
+    829:829:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2092 -> a
+    829:829:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    829:829:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    829:829:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    830:830:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2095:2095 -> a
+    830:830:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    830:830:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    830:830:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    831:838:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2119:2126 -> a
+    831:838:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2097 -> a
+    831:838:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    831:838:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    831:838:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    839:840:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100:2101 -> a
+    839:840:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    839:840:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    839:840:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    841:848:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2119:2126 -> a
+    841:848:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2102 -> a
+    841:848:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
+    841:848:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    841:848:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    849:850:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1750:1751 -> a
+    849:850:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    849:850:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    851:851:void increaseCapacity(int):2959:2959 -> a
+    851:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752 -> a
+    851:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    851:851:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    852:852:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1755:1755 -> a
+    852:852:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    852:852:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    853:855:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    853:855:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1757 -> a
+    853:855:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    853:855:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    856:864:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1759:1767 -> a
+    856:864:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    856:864:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    865:867:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    865:867:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768 -> a
+    865:867:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    865:867:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    868:868:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1769:1769 -> a
+    868:868:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
+    868:868:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
+    869:914:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):656:701 -> a
+    915:929:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674:688 -> a
+    930:937:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):662:669 -> a
+    938:978:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:706 -> a
+    979:982:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):705:708 -> a
+    983:983:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:707 -> a
+    984:991:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):764:771 -> a
+    992:996:int realRegisterNumberFromAllocated(int):816:820 -> a
+    997:1035:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):983:1021 -> a
+    1036:1037:void lambda$invariantsHold$3(java.util.TreeSet,int):991:992 -> a
+    1038:1044:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1175:1181 -> a
+    1045:1045:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1045:1045:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1182 -> a
+    1046:1046:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1183 -> a
+    1047:1057:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1190 -> a
+    1058:1061:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1238:1241 -> a
+    1058:1061:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
+    1062:1062:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1062:1062:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1245 -> a
+    1062:1062:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
+    1063:1063:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1244:1244 -> a
+    1063:1063:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
+    1064:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1194:1194 -> a
+    1065:1078:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1192:1205 -> a
+    1079:1079:int getFreeConsecutiveRegisters(int):2972:2972 -> a
+    1079:1079:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1080:1081:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1209 -> a
+    1082:1087:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1048 -> a
+    1082:1087:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1088:1088:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1047:1047 -> a
+    1088:1088:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1089:1089:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1046:1046 -> a
+    1089:1089:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
+    1090:1103:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1211:1224 -> a
+    1104:1128:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1207:1231 -> a
+    1129:1148:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1267:1286 -> a
+    1149:1156:boolean registersAreFreeAndConsecutive(int,boolean):3028:3035 -> a
+    1149:1156:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1286 -> a
+    1157:1182:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1287:1312 -> a
+    1183:1213:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1328:1358 -> a
+    1214:1214:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1214:1214:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1359 -> a
+    1215:1231:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1366:1382 -> a
+    1232:1238:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1831:1837 -> a
+    1239:1251:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> a
+    1239:1251:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1838 -> a
+    1252:1252:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1842:1842 -> a
+    1253:1257:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> a
+    1253:1257:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1843 -> a
+    1258:1260:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> a
+    1258:1260:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1846 -> a
+    1261:1262:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1854:1855 -> a
+    1263:1293:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1860:1890 -> a
+    1263:1293:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1856 -> a
+    1294:1306:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1911:1923 -> a
+    1307:1312:int handleWorkaround(java.util.function.Predicate,java.util.function.BiPredicate,int,com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1941:1946 -> a
+    1313:1325:int getLargestValidCandidate(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1961:1973 -> a
+    1326:1328:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2109:2111 -> a
+    1329:1329:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2168:2168 -> a
+    1330:1330:boolean atLeastOneOfRegistersAreTaken(int,boolean):3125:3125 -> a
+    1330:1330:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169 -> a
+    1331:1377:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169:2215 -> a
+    1378:1400:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2283:2305 -> a
+    1378:1400:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
+    1401:1401:int toGapPosition(int):1394:1394 -> a
+    1401:1401:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2305 -> a
+    1401:1401:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
+    1402:1415:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2305:2318 -> a
+    1402:1415:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
+    1416:1416:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219:2219 -> a
+    1417:1424:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2232:2239 -> a
+    1417:1424:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220 -> a
+    1425:1452:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2246:2273 -> a
+    1425:1452:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2222 -> a
+    1453:1454:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2227:2228 -> a
+    1455:1457: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):2327:2329 -> a
+    1458:1458:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> a
+    1458:1458: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
+    1459:1466: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
+    1467:1502: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
+    1503:1503:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1503:1503:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
+    1503:1503: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
+    1504:1510: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
+    1511:1562:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2520:2571 -> a
+    1563:1569:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2568:2574 -> a
+    1570:1570:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1570:1570:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574 -> a
+    1571:1578:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2581 -> a
+    1579:1579:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    1579:1579:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2653 -> a
+    1579:1579:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581 -> a
+    1580:1617:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2581:2618 -> a
+    1618:1619:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2645:2646 -> a
+    1618:1619:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2622 -> a
+    1620:1637:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2619:2636 -> a
+    1638:1660:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2722:2744 -> a
+    1661:1661:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2766:2766 -> a
+    1662:1666:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2871:2875 -> a
+    1662:1666:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2766 -> a
+    1667:1700:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2800 -> a
+    1701:1702:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():828:829 -> a
+    1701:1702:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802 -> a
+    1703:1703:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803:2803 -> a
+    1704:1705:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2751:2752 -> a
+    1704:1705:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803 -> a
+    1706:1707:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804:2805 -> a
+    1708:1711:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2757:2760 -> a
+    1708:1711:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2806 -> a
+    1712:1736:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2808:2832 -> a
+    1737:1763:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2840:2866 -> a
+    1737:1763:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2833 -> a
+    1764:1764:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2774:2774 -> a
+    1765:1809:int getFreeConsecutiveRegisters(int,boolean):2976:3020 -> a
+    1810:1821:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2982:2993 -> a
+    1822:1825:int getNextFreeRegister(java.util.Iterator):3044:3047 -> a
+    1826:1838:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3051:3063 -> a
+    1839:1850:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3069:3080 -> a
+    1851:1851:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3175:3175 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     1:1:void allocateRegisters():207:207 -> b
     2:11:boolean noLinkedValues():3129:3138 -> b
@@ -40714,14 +41392,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():1293:1293 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1327:1327 -> 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():1302:1302 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1336:1336 -> 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
@@ -40741,230 +41419,50 @@
     1164:1165:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> b
     1164:1165:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):620 -> b
     1166:1166:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:622 -> b
-    1167:1171:int realRegisterNumberFromAllocated(int):816:820 -> b
-    1172:1173:void lambda$invariantsHold$4(java.util.TreeSet,int):1008:1009 -> b
-    1174:1191:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409:1426 -> b
-    1192:1196:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> b
-    1197:1201:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2131:2135 -> b
-    1202:1202:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> b
-    1202:1202:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136 -> b
-    1203:1229:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2137:2163 -> b
-    1230:1234:void increaseCapacity(int,boolean):2964:2968 -> b
+    1167:1168:void lambda$invariantsHold$4(java.util.TreeSet,int):1008:1009 -> b
+    1169:1186:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409:1426 -> b
+    1187:1191:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> b
+    1192:1196:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2131:2135 -> b
+    1197:1197:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> b
+    1197:1197:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2136 -> b
+    1198:1224:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2137:2163 -> b
+    1225:1229:void increaseCapacity(int,boolean):2964:2968 -> b
+    1230:1231:boolean registerIsFree(int):3105:3106 -> b
     1:3:int registersUsed():591:593 -> c
-    4:4:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645:645 -> c
-    5:16:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):778:789 -> c
-    5:16:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):648 -> c
-    17:17:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649:649 -> c
-    18:26:void pinArgumentRegisters():2945:2953 -> c
-    18:26:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> c
-    27:27:void pinArgumentRegisters():2950:2950 -> c
-    27:27:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> c
-    28:89:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):826:887 -> c
-    28:89:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    90:90:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    90:90:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> c
-    90:90:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    91:112:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):893:914 -> c
-    91:112:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    113:119:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1060 -> c
-    113:119:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> c
-    113:119:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    120:120:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    120:120:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1060 -> c
-    120:120:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> c
-    120:120:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    121:122:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1061:1062 -> c
-    121:122:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> c
-    121:122:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    123:129:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1073:1079 -> c
-    123:129:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> c
-    123:129:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    130:130:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    130:130:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> c
-    130:130:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> c
-    130:130:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    131:136:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1080:1085 -> c
-    131:136:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> c
-    131:136:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    137:137:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    137:137:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> c
-    137:137:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> c
-    137:137:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    138:138:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> c
-    138:138:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> c
-    138:138:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    139:204:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1101:1166 -> c
-    139:204:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> c
-    139:204:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    205:254:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923:972 -> c
-    205:254:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    255:267:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1608:1620 -> c
-    255:267:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    255:267:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    268:270:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> c
-    268:270:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1621 -> c
-    268:270:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    268:270:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    271:322:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1631:1682 -> c
-    271:322:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    271:322:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    323:323:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    323:323:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1683 -> c
-    323:323:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    323:323:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    324:328:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1684:1688 -> c
-    324:328:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    324:328:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    329:329:int toInstructionPosition(int):1390:1390 -> c
-    329:329:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1688 -> c
-    329:329:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    329:329:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    330:341:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1693:1704 -> c
-    330:341:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    330:341:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    342:350:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1027:1035 -> c
-    342:350:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> c
-    342:350:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    342:350:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    351:379:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1783:1811 -> c
-    351:379:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1707 -> c
-    351:379:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    351:379:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    380:408:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1713:1741 -> c
-    380:408:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    380:408:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    409:411:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> c
-    409:411:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> c
-    409:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    409:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    412:412:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1743:1743 -> c
-    412:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    412:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    413:431:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1981:1999 -> c
-    413:431:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    413:431:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    413:431:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    432:441:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1998:2007 -> c
-    432:441:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    432:441:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    432:441:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    442:442:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):350:350 -> c
-    442:442:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2008 -> c
-    442:442:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    442:442:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    442:442:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    443:515:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2009:2081 -> c
-    443:515:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    443:515:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    443:515:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    516:523:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1255:1262 -> c
-    516:523:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083 -> c
-    516:523:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    516:523:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    516:523:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    524:524:void increaseCapacity(int):2959:2959 -> c
-    524:524:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1262 -> c
-    524:524:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083 -> c
-    524:524:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    524:524:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    524:524:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    525:527:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> c
-    525:527:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> c
-    525:527:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    525:527:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    525:527:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    528:534:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2085:2091 -> c
-    528:534:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    528:534:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    528:534:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    535:535:void increaseCapacity(int):2959:2959 -> c
-    535:535:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2092 -> c
-    535:535:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    535:535:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    535:535:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    536:536:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2095:2095 -> c
-    536:536:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    536:536:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    536:536:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    537:544:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2119:2126 -> c
-    537:544:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2097 -> c
-    537:544:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    537:544:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    537:544:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    545:546:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100:2101 -> c
-    545:546:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    545:546:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    545:546:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    547:554:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2119:2126 -> c
-    547:554:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2102 -> c
-    547:554:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> c
-    547:554:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    547:554:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    555:556:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1750:1751 -> c
-    555:556:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    555:556:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    557:557:void increaseCapacity(int):2959:2959 -> c
-    557:557:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752 -> c
-    557:557:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    557:557:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    558:558:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1755:1755 -> c
-    558:558:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    558:558:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    559:561:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> c
-    559:561:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1757 -> c
-    559:561:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    559:561:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    562:563:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1767 -> c
-    562:563:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    562:563:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    564:566:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1897:1899 -> c
-    564:566:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768 -> c
-    564:566:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    564:566:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    567:567:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1769:1769 -> c
-    567:567:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> c
-    567:567:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> c
-    568:613:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):656:701 -> c
-    614:628:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674:688 -> c
-    629:636:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):662:669 -> c
-    637:677:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:706 -> c
-    678:681:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):705:708 -> c
-    682:682:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:707 -> c
-    683:683:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
-    684:684:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1308:1308 -> c
-    684:684:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    685:705:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
-    706:718:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
-    719:720:boolean registerIsFree(int):3105:3106 -> c
-    1:6:int unadjustedRealRegisterFromAllocated(int):802:807 -> d
-    7:7:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1341:1341 -> d
-    8:8:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    9:9:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1515:1515 -> d
-    10:10:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    11:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
-    30:30:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    31:31:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
-    32:32:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    32:32:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1341:1341 -> d
-    33:33:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    33:33:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    34:34:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    34:34:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1515:1515 -> d
-    35:35:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    35:35:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    36:54:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
-    36:54:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    55:55:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    55:55:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    55:55:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    56:71:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1487 -> d
-    72:72:void clearUserInfo():2657:2657 -> d
-    73:73:boolean registersAreFree(int,boolean):3112:3112 -> d
+    4:9:int unadjustedRealRegisterFromAllocated(int):802:807 -> c
+    10:10:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1342:1342 -> c
+    11:11:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
+    12:32:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
+    33:45:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
+    46:46:boolean registersAreFree(int,boolean):3112:3112 -> c
+    1:1:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1375:1375 -> d
+    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
+    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1549:1549 -> d
+    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
+    5:23:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
+    24:24:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
+    24:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
+    25:25:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
+    26:26:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
+    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1375:1375 -> d
+    27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
+    27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
+    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1549:1549 -> d
+    29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
+    29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    30:48:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
+    30:48:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    49:49:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
+    49:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
+    49:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    50:65:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1487 -> d
+    66:66:void clearUserInfo():2657:2657 -> d
     1:26:boolean computeUnusedRegisters():546:571 -> e
     27:37:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1590:1600 -> e
     1:2:int getMoveExceptionRegister():185:186 -> f
@@ -40990,7 +41488,15 @@
     1:6:void removeSpillAndPhiMoves():752:757 -> j
     1:28:boolean unsplitArguments():719:746 -> k
     1:20:java.lang.String toString():3146:3165 -> toString
-com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.ir.regalloc.a$a:
+com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode -> com.android.tools.r8.ir.regalloc.a$a:
+    com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode ALLOW_ARGUMENT_REUSE_U8BIT -> b
+    com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode ALLOW_ARGUMENT_REUSE_U16BIT -> c
+    com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode ALLOW_ARGUMENT_REUSE_U4BIT -> a
+    com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode[] $VALUES -> d
+    1:3:void <clinit>():94:96 -> <clinit>
+    4:4:void <clinit>():93:93 -> <clinit>
+    1:1:void <init>(java.lang.String,int):93:93 -> <init>
+com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.ir.regalloc.a$b:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> f
     int start -> d
@@ -41361,7 +41867,7 @@
     60:64:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     65:73:void removeArgumentRestores(java.util.Set):332:340 -> a
     74:98:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1277:1277 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1311:1311 -> a
     99:99:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     100:105:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     106:110:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -41382,7 +41888,7 @@
     10:10:java.util.Set lambda$scheduleMovesBeforeInstruction$4(java.lang.Integer):305:305 -> e
     1:43:void addSpillOrRestoreMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):66:108 -> f
     44:44:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.t.d.a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.s.d.a:
     1:1:void <init>():25:25 -> <init>
     1:2:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):42:43 -> buildIR
     1:1:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):58:58 -> buildInliningIR
@@ -41395,27 +41901,27 @@
     1:1:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):77 -> registerCodeReferencesForDesugaring
     1:1:java.lang.String toString():67:67 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):96:96 -> toString
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.t.d.a$a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.s.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.t.d.g:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.s.d.g:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):40:40 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):44:44 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):44 -> a
     3:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):47:50 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.t.d.b:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.s.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):280:281 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():286:294 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():292:292 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():289:301 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.t.d.c:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.s.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):312:313 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():318:328 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():326:326 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():323:332 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.t.d.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.s.d.d:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -41436,7 +41942,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():129 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():128:128 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():125:137 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.t.d.e:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.s.d.e:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -41454,7 +41960,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):55:55 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():207 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():209:214 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.t.d.f:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.s.d.f:
     com.android.tools.r8.graph.DexField wrapperField -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType argType -> c
@@ -41464,7 +41970,7 @@
     1:34:com.android.tools.r8.graph.CfCode generateCfCode():234:267 -> a
     35:35:com.android.tools.r8.graph.CfCode generateCfCode():265:265 -> a
     36:45:com.android.tools.r8.graph.CfCode generateCfCode():262:271 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.t.d.h:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.s.d.h:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -41473,31 +41979,36 @@
     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.EnumUnboxingCfCodeProvider -> com.android.tools.r8.t.d.k:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):36:36 -> <init>
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.t.d.i:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.s.d.l:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):37:37 -> <init>
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingDefaultToStringCfCodeProvider -> com.android.tools.r8.s.d.i:
+    com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap map -> c
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):47:49 -> <init>
+    1:21:com.android.tools.r8.graph.CfCode generateCfCode():59:79 -> a
+    22:28:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):66:72 -> a
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.s.d.j:
     com.android.tools.r8.graph.DexType enumType -> c
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap map -> d
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):46:48 -> <init>
-    1:39:com.android.tools.r8.graph.CfCode generateCfCode():60:98 -> a
-    40:40:com.android.tools.r8.graph.CfCode generateCfCode():97:97 -> a
-    41:55:com.android.tools.r8.graph.CfCode generateCfCode():93:107 -> a
-    56:64:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):79:87 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.t.d.j:
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):90:92 -> <init>
+    1:39:com.android.tools.r8.graph.CfCode generateCfCode():104:142 -> a
+    40:40:com.android.tools.r8.graph.CfCode generateCfCode():141:141 -> a
+    41:55:com.android.tools.r8.graph.CfCode generateCfCode():137:151 -> a
+    56:64:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):123:131 -> a
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.s.d.k:
     boolean $assertionsDisabled -> f
     int numEnumInstances -> d
     com.android.tools.r8.graph.DexMethod initializationMethod -> e
     com.android.tools.r8.graph.DexField utilityField -> c
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,int,com.android.tools.r8.graph.DexMethod):123:127 -> <init>
-    1:12:com.android.tools.r8.graph.CfCode generateCfCode():139:150 -> a
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.t.d.l:
+    1:1:void <clinit>():155:155 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,int,com.android.tools.r8.graph.DexMethod):167:171 -> <init>
+    1:12:com.android.tools.r8.graph.CfCode generateCfCode():183:194 -> a
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.s.d.m:
     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 -> f
     12:19:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):37:44 -> f
     1:1:void prepareInstructions():30:30 -> h
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.t.d.m:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.s.d.n:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -41518,7 +42029,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():503:503 -> 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.t.d.n:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.s.d.o:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -41535,7 +42046,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.t.d.n$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.s.d.o$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -41555,7 +42066,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.t.d.o:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.s.d.p:
     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>
@@ -41563,7 +42074,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.t.d.p:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.s.d.q:
     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>
@@ -41571,7 +42082,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.t.d.q:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.s.d.r:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -41622,19 +42133,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.u.a.a.a.a:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.u.a.a.a.b:
+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:
     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.u.a.a.a.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.t.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.u.a.a.a.d:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.u.a.a.a.e.a:
+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:
     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
@@ -41643,15 +42154,16 @@
     boolean contains(boolean) -> b
     1:4:boolean rem(boolean):94:97 -> c
     1:1:boolean contains(java.lang.Object):129:129 -> contains
+    1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1.iterator():803:803 -> iterator
     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.u.a.a.a.e.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanIterator -> com.android.tools.r8.t.a.a.a.e.b:
     1:1:void <init>():34:34 -> <init>
     boolean nextBoolean() -> f
     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.u.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.t.a.a.a.e.c:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -41660,7 +42172,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.u.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.t.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
@@ -41680,20 +42192,20 @@
     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.u.a.a.a.e.d:
+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 this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:3:boolean nextBoolean():129:129 -> f
     1:1:boolean hasNext():124:124 -> hasNext
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.u.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.t.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.u.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.u.a.a.a.e.i:
+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:
     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.u.a.a.a.e.h:
+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.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -41721,14 +42233,14 @@
     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.u.a.a.a.e.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.t.a.a.a.e.j:
     boolean nextBoolean() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.e.k:
+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 i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean nextBoolean():735:735 -> f
     1:1:boolean hasNext():730:730 -> hasNext
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.u.a.a.a.f.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.t.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>
@@ -41772,7 +42284,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.u.a.a.a.f.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.f.a:
     int value -> b
     int key -> a
     1:3:void <init>(int,int):122:124 -> <init>
@@ -41791,7 +42303,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.u.a.a.a.f.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction -> com.android.tools.r8.t.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
@@ -41802,18 +42314,20 @@
     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.u.a.a.a.f.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap -> com.android.tools.r8.t.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
     1:4:boolean equals(java.lang.Object):296:299 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
     1:4:int hashCode():286:289 -> hashCode
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> i
+    1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.keySet():37:37 -> keySet
     1:13:void putAll(java.util.Map):70:82 -> putAll
     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.u.a.a.a.f.d:
+    1:1:java.util.Collection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.values():1435:1435 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceMap$BasicEntry -> com.android.tools.r8.t.a.a.a.f.d:
     java.lang.Object value -> b
     int key -> a
     1:3:void <init>(int,java.lang.Object):109:111 -> <init>
@@ -41825,17 +42339,20 @@
     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.u.a.a.a.f.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.f.f:
     1:1:void <init>():33:33 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.int2ReferenceEntrySet():1435:1435 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> entrySet
     1:1:java.util.Set entrySet():30 -> entrySet
     1:1:java.lang.Integer firstKey():85:85 -> firstKey
     1:1:java.lang.Object firstKey():30 -> firstKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):30:30 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):46:46 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):30 -> headMap
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():293:293 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1435:1435 -> keySet
+    2:2:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1435:1435 -> keySet
     1:1:java.lang.Integer lastKey():98:98 -> lastKey
     1:1:java.lang.Object lastKey():30 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):30:30 -> subMap
@@ -41844,7 +42361,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.u.a.a.a.f.f$a:
+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 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
@@ -41852,7 +42369,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.u.a.a.a.f.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection -> com.android.tools.r8.t.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
@@ -41872,15 +42389,16 @@
     boolean contains(int) -> b
     1:1:boolean contains(java.lang.Object):129:129 -> contains
     1:4:boolean rem(int):94:97 -> g
+    1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet.iterator():803:803 -> iterator
     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.u.a.a.a.f.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator -> com.android.tools.r8.t.a.a.a.f.h:
     1:1:void <init>():34:34 -> <init>
     int nextInt() -> i
     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.u.a.a.a.f.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList -> com.android.tools.r8.t.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
@@ -41928,6 +42446,7 @@
     1:1:int lastIndexOf(java.lang.Object):634:634 -> lastIndexOf
     1:1:java.util.ListIterator listIterator():32:32 -> listIterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():192:192 -> listIterator
+    3:3:java.util.ListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton.listIterator(int):332:332 -> listIterator
     1:1:java.lang.Integer remove(int):648:648 -> remove
     1:1:java.lang.Object remove(int):32 -> remove
     1:1:java.lang.Object set(int,java.lang.Object):32:32 -> set
@@ -41935,7 +42454,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):32 -> set
     1:1:java.util.List subList(int,int):32:32 -> 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.u.a.a.a.f.j:
+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.IntList l -> a
     int from -> b
     int to -> c
@@ -41990,7 +42509,7 @@
     5:5:java.lang.Object set(int,java.lang.Object):726 -> set
     1:1:int size():792:792 -> size
     1:1:java.util.List subList(int,int):726:726 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.u.a.a.a.f.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList$IntSubList$1 -> com.android.tools.r8.t.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
@@ -42007,7 +42526,7 @@
     1:1:int nextIndex():844:844 -> nextIndex
     1:1:int previousIndex():848:848 -> previousIndex
     1:11:void remove():864:864 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.u.a.a.a.f.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntListIterator -> com.android.tools.r8.t.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
@@ -42023,13 +42542,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.u.a.a.a.f.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSet -> com.android.tools.r8.t.a.a.a.f.m:
     1:1:void <init>():32:32 -> <init>
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:1:boolean rem(int):87:87 -> g
     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.u.a.a.a.f.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet -> com.android.tools.r8.t.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
@@ -42044,6 +42563,8 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.headSet(int):155:155 -> headSet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(java.lang.Integer):55 -> headSet
     3:3:java.util.SortedSet headSet(java.lang.Object):22 -> headSet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet.iterator():1308:1308 -> iterator
+    2:2:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet.iterator():1308:1308 -> iterator
     1:1:java.lang.Integer last():107:107 -> last
     1:1:java.lang.Object last():22 -> last
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.lastInt():150:150 -> last
@@ -42063,7 +42584,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.u.a.a.a.f.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.t.a.a.a.f.r:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -42073,10 +42594,10 @@
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,int):37:37 -> a
     3:3:boolean containsKey(int):261:261 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():230:230 -> b
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> b
-    3:22:int put(int,int):279:298 -> b
+    2:21:int put(int,int):279:298 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():230:230 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> c
     1:1:void clear():256:256 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap clone():339:344 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -42087,9 +42608,9 @@
     1:7:int remove(int):304:310 -> f
     1:3:int findKey(int):234:236 -> g
     1:4:int get(int):243:246 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> h
-    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 -> h
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> i
+    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 -> i
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> i
     1:1:boolean isEmpty():273:273 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
@@ -42100,8 +42621,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.u.a.a.a.f.o:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.f.q:
+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 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>
@@ -42111,7 +42632,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.u.a.a.a.f.p:
+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 this$1 -> c
     int next -> b
     int curr -> a
@@ -42120,15 +42641,15 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.u.a.a.a.f.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.t.a.a.a.f.s:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.u.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.u.a.a.a.f.t:
+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.objects.ObjectSet int2IntEntrySet() -> c
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.t.a.a.a.f.t:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.f.u:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.f.E:
+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 entries -> i
     int[] key -> b
     int[] value -> c
@@ -42150,8 +42671,8 @@
     1:16:int insert(int,int):248:263 -> b
     1:16:int put(int,int):270 -> b
     17:19:int put(int,int):271:273 -> b
-    20:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> b
-    20:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet int2IntEntrySet():773:774 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> c
     1:4:void clear():420:423 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap clone():1017:1026 -> clone
     1:10:java.lang.Object clone():50 -> clone
@@ -42170,10 +42691,10 @@
     9:9:int removeEntry(int):223:223 -> h
     10:15:void shiftKeys(int):341:346 -> h
     10:15:int removeEntry(int):222 -> h
-    16:19:int removeNullEntry():228:231 -> h
     1:1:int realSize():206:206 -> hashCode
     1:1:int hashCode():1043 -> hashCode
     2:10:int hashCode():1044:1052 -> hashCode
+    1:4:int removeNullEntry():228:231 -> i
     1:1:boolean isEmpty():433:433 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():834:835 -> keySet
     1:2:java.util.Set keySet():50 -> keySet
@@ -42189,15 +42710,14 @@
     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.u.a.a.a.f.w:
+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 this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:boolean contains(int):879:879 -> b
     1:1:void clear():884:884 -> clear
-    1:1: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: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.u.a.a.a.f.x:
+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 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>
@@ -42205,23 +42725,22 @@
     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.u.a.a.a.f.y:
+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 this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> i
     1:1:java.lang.Integer next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.f.z:
+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 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>
     1:1:boolean contains(int):816:816 -> b
     1:1:void clear():828:828 -> clear
-    1:1:java.util.Iterator iterator():803:803 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.f.A:
+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 this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -42242,17 +42761,16 @@
     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.u.a.a.a.f.B:
+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 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>
     1:1:void clear():767:767 -> clear
     1:17:boolean contains(java.lang.Object):701:717 -> contains
-    1:1:java.util.Iterator iterator():689:689 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.f.C:
+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.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -42270,13 +42788,13 @@
     13:22:void remove():644 -> remove
     23:24:void remove():647:648 -> remove
     25:25:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.D:
+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 this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> i
     1:1:java.lang.Integer next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.u.a.a.a.f.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.t.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
@@ -42288,92 +42806,90 @@
     int count -> c
     1:1:void <init>():79:79 -> <init>
     2:10:void <init>():73:81 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():41:41 -> a
-    2:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):305:315 -> a
-    2:12:java.lang.Object put(int,java.lang.Object):283 -> a
-    13:13:int compare(int,int):232:232 -> a
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):315 -> a
+    1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):305:315 -> a
+    1:11:java.lang.Object put(int,java.lang.Object):283 -> a
+    12:12:int compare(int,int):232:232 -> a
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):315 -> a
+    12:12:java.lang.Object put(int,java.lang.Object):283 -> a
+    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):318 -> a
     13:13:java.lang.Object put(int,java.lang.Object):283 -> a
-    14:14:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    14:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):318 -> a
-    14:14:java.lang.Object put(int,java.lang.Object):283 -> a
-    15:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):323:330 -> a
-    15:22:java.lang.Object put(int,java.lang.Object):283 -> a
-    23:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):862:863 -> a
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):331 -> a
-    23:24:java.lang.Object put(int,java.lang.Object):283 -> a
-    25:33:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):335:343 -> a
-    25:33:java.lang.Object put(int,java.lang.Object):283 -> a
-    34:35:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):851:852 -> a
-    34:35:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):344 -> a
-    34:35:java.lang.Object put(int,java.lang.Object):283 -> a
-    36:38:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):354:356 -> a
-    36:38:java.lang.Object put(int,java.lang.Object):283 -> a
-    39:39:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    39:39:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):358 -> a
+    14:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):323:330 -> a
+    14:21:java.lang.Object put(int,java.lang.Object):283 -> a
+    22:23:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):862:863 -> a
+    22:23:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):331 -> a
+    22:23:java.lang.Object put(int,java.lang.Object):283 -> a
+    24:32:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):335:343 -> a
+    24:32:java.lang.Object put(int,java.lang.Object):283 -> a
+    33:34:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):851:852 -> a
+    33:34:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):344 -> a
+    33:34:java.lang.Object put(int,java.lang.Object):283 -> a
+    35:37:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):354:356 -> a
+    35:37:java.lang.Object put(int,java.lang.Object):283 -> a
+    38:38:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    38:38:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):358 -> a
+    38:38:java.lang.Object put(int,java.lang.Object):283 -> a
+    39:39:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):359:359 -> a
     39:39:java.lang.Object put(int,java.lang.Object):283 -> a
-    40:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):359:359 -> a
+    40:40:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    40:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):360 -> a
     40:40:java.lang.Object put(int,java.lang.Object):283 -> a
-    41:41:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    41:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):360 -> a
-    41:41:java.lang.Object put(int,java.lang.Object):283 -> a
-    42:43:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):362:363 -> a
-    42:43:java.lang.Object put(int,java.lang.Object):283 -> a
-    44:45:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
-    44:45:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):364 -> a
-    44:45:java.lang.Object put(int,java.lang.Object):283 -> a
-    46:56:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):365:375 -> a
-    46:56:java.lang.Object put(int,java.lang.Object):283 -> a
-    57:57:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    57:57:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):376 -> a
-    57:57:java.lang.Object put(int,java.lang.Object):283 -> a
-    58:68:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):377:387 -> a
-    58:68:java.lang.Object put(int,java.lang.Object):283 -> a
-    69:70:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
-    69:70:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):388 -> a
-    69:70:java.lang.Object put(int,java.lang.Object):283 -> a
-    71:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):389:391 -> a
-    71:73:java.lang.Object put(int,java.lang.Object):283 -> a
-    74:75:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
-    74:75:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):392 -> a
-    74:75:java.lang.Object put(int,java.lang.Object):283 -> a
-    76:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):393:397 -> a
-    76:80:java.lang.Object put(int,java.lang.Object):283 -> a
-    81:81:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    81:81:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):398 -> a
-    81:81:java.lang.Object put(int,java.lang.Object):283 -> a
-    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):400:401 -> a
-    82:83:java.lang.Object put(int,java.lang.Object):283 -> a
-    84:85:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
-    84:85:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):402 -> a
-    84:85:java.lang.Object put(int,java.lang.Object):283 -> a
-    86:96:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):403:413 -> a
-    86:96:java.lang.Object put(int,java.lang.Object):283 -> a
-    97:97:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
-    97:97:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):414 -> a
-    97:97:java.lang.Object put(int,java.lang.Object):283 -> a
-    98:108:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):415:425 -> a
-    98:108:java.lang.Object put(int,java.lang.Object):283 -> a
-    109:110:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
-    109:110:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):426 -> a
-    109:110:java.lang.Object put(int,java.lang.Object):283 -> a
-    111:113:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):427:429 -> a
-    111:113:java.lang.Object put(int,java.lang.Object):283 -> a
-    114:115:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
-    114:115:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):430 -> a
-    114:115:java.lang.Object put(int,java.lang.Object):283 -> a
-    116:123:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):431:438 -> a
-    116:123:java.lang.Object put(int,java.lang.Object):283 -> a
-    124:125:java.lang.Object put(int,java.lang.Object):284:285 -> a
-    126:126:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):348:348 -> a
-    126:126:java.lang.Object put(int,java.lang.Object):283 -> a
-    127:127:boolean containsKey(int):980:980 -> a
-    128:206:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1161:1239 -> a
-    207:207:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
+    41:42:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):362:363 -> a
+    41:42:java.lang.Object put(int,java.lang.Object):283 -> a
+    43:44:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
+    43:44:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):364 -> a
+    43:44:java.lang.Object put(int,java.lang.Object):283 -> a
+    45:55:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):365:375 -> a
+    45:55:java.lang.Object put(int,java.lang.Object):283 -> a
+    56:56:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    56:56:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):376 -> a
+    56:56:java.lang.Object put(int,java.lang.Object):283 -> a
+    57:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):377:387 -> a
+    57:67:java.lang.Object put(int,java.lang.Object):283 -> a
+    68:69:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
+    68:69:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):388 -> a
+    68:69:java.lang.Object put(int,java.lang.Object):283 -> a
+    70:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):389:391 -> a
+    70:72:java.lang.Object put(int,java.lang.Object):283 -> a
+    73:74:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
+    73:74:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):392 -> a
+    73:74:java.lang.Object put(int,java.lang.Object):283 -> a
+    75:79:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):393:397 -> a
+    75:79:java.lang.Object put(int,java.lang.Object):283 -> a
+    80:80:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    80:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):398 -> a
+    80:80:java.lang.Object put(int,java.lang.Object):283 -> a
+    81:82:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):400:401 -> a
+    81:82:java.lang.Object put(int,java.lang.Object):283 -> a
+    83:84:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
+    83:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):402 -> a
+    83:84:java.lang.Object put(int,java.lang.Object):283 -> a
+    85:95:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):403:413 -> a
+    85:95:java.lang.Object put(int,java.lang.Object):283 -> a
+    96:96:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> a
+    96:96:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):414 -> a
+    96:96:java.lang.Object put(int,java.lang.Object):283 -> a
+    97:107:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):415:425 -> a
+    97:107:java.lang.Object put(int,java.lang.Object):283 -> a
+    108:109:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):840:841 -> a
+    108:109:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):426 -> a
+    108:109:java.lang.Object put(int,java.lang.Object):283 -> a
+    110:112:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):427:429 -> a
+    110:112:java.lang.Object put(int,java.lang.Object):283 -> a
+    113:114:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry):829:830 -> a
+    113:114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):430 -> a
+    113:114:java.lang.Object put(int,java.lang.Object):283 -> a
+    115:122:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):431:438 -> a
+    115:122:java.lang.Object put(int,java.lang.Object):283 -> a
+    123:124:java.lang.Object put(int,java.lang.Object):284:285 -> a
+    125:125:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry add(int):348:348 -> a
+    125:125:java.lang.Object put(int,java.lang.Object):283 -> a
+    126:126:boolean containsKey(int):980:980 -> a
+    127:127:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1421:1421 -> a
+    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1161:1239 -> b
+    80:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1416:1416 -> b
     1:1:int compare(int,int):232:232 -> c
-    2:4:int firstIntKey():1001:1001 -> c
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> c
     1:6:void clear():701:706 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap clone():1948:1954 -> clone
     1:7:java.lang.Object clone():41 -> clone
@@ -42405,17 +42921,16 @@
     4:4:int compare(int,int):232:232 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry findKey(int):247 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry findKey(int):248:248 -> d
+    6:8:int firstIntKey():1001:1001 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):262:264 -> e
     4:4:int compare(int,int):232:232 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):264 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):266:266 -> e
-    1:3:int lastIntKey():1007:1007 -> g
     1:2:java.lang.Object get(int):995:996 -> get
-    1:1:void allocatePaths():278:278 -> i
+    1:3:int lastIntKey():1007:1007 -> h
     1:1:boolean isEmpty():990:990 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():41:41 -> keySet
-    2:2:java.util.Set keySet():41:41 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
+    1:1:void allocatePaths():278:278 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     1:8:java.lang.Object remove(int):484:491 -> remove
     9:9:int compare(int,int):232:232 -> remove
     9:9:java.lang.Object remove(int):491 -> remove
@@ -42467,10 +42982,9 @@
     198:201:java.lang.Object remove(int):681:684 -> remove
     202:205:java.lang.Object remove(int):494:497 -> remove
     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.u.a.a.a.f.F:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.u.a.a.a.f.H:
+    1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.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 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>
@@ -42482,9 +42996,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1161:1161 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1231:1231 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1161 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1161:1161 -> iterator
-    2:2:java.util.Iterator iterator():1161:1161 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1175:1175 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1175:1175 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1221:1221 -> last
     1:1:java.lang.Object last():1161 -> last
     1:5:boolean remove(java.lang.Object):1196:1200 -> remove
@@ -42495,21 +43007,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.u.a.a.a.f.G:
+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 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.u.a.a.a.f.I:
+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 this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
-    1:1: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: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.u.a.a.a.f.J:
+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 right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -42536,7 +43047,7 @@
     1:1:boolean succ():795:795 -> j
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.u.a.a.a.f.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.t.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
@@ -42548,7 +43059,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.u.a.a.a.f.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.t.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
@@ -42562,14 +43073,12 @@
     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.u.a.a.a.f.K$c:
+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 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.u.a.a.a.f.K$d:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.t.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
@@ -42579,29 +43088,26 @@
     int to -> c
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,int,boolean,int,boolean):1466:1472 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():1435:1435 -> a
-    2:82:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1497:1577 -> a
-    83:83:boolean containsKey(int):1624:1624 -> a
-    84:84:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.containsKey(int):980:980 -> a
-    84:84:boolean containsKey(int):1624 -> a
-    85:88:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
-    89:90:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1699 -> a
-    91:323:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> a
-    91:323:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1699 -> a
-    324:325:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1699:1700 -> a
-    326:558:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> a
-    326:558:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1700 -> a
-    559:561:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1700:1702 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
-    3:235:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> b
-    3:235:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1693 -> b
-    236:236:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1693:1693 -> b
+    1:1:boolean containsKey(int):1624:1624 -> a
+    2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.containsKey(int):980:980 -> a
+    2:2:boolean containsKey(int):1624 -> a
+    3:6:java.lang.Object put(int,java.lang.Object):1648:1651 -> a
+    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1698:1699 -> a
+    9:241:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> a
+    9:241:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1699 -> a
+    242:243:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1699:1700 -> a
+    244:476:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> a
+    244:476:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1700 -> a
+    477:479:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1700:1702 -> a
+    1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1497:1577 -> b
+    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
+    84:316:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> b
+    84:316:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1693 -> b
+    317:317:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1693:1693 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> c
     3:235:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> c
     3:235:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1687 -> c
     236:236:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1687:1687 -> c
-    237:239:int firstIntKey():1753:1755 -> c
-    240:240:int firstIntKey():1754:1754 -> c
     1:4:void clear():1477:1480 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
@@ -42613,15 +43119,11 @@
     235:235:boolean in(int):1492:1492 -> d
     236:468:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> d
     236:468:boolean in(int):1492 -> d
-    1:3:int lastIntKey():1760:1762 -> g
-    4:4:int lastIntKey():1761:1761 -> g
+    469:471:int firstIntKey():1753:1755 -> d
+    472:472:int firstIntKey():1754:1754 -> d
     1:1:java.lang.Object get(int):1643:1643 -> get
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1720 -> i
-    10:242:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> i
-    10:242:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720 -> i
-    243:247:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720:1724 -> i
-    248:480:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> i
-    248:480:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1724 -> i
+    1:3:int lastIntKey():1760:1762 -> h
+    4:4:int lastIntKey():1761:1761 -> h
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1777 -> isEmpty
     1:1:boolean isEmpty():1676 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1043:1043 -> isEmpty
@@ -42629,20 +43131,23 @@
     2:2:boolean isEmpty():1676 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1778:1778 -> isEmpty
     3:3:boolean isEmpty():1676 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1743 -> j
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1720 -> j
     10:242:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> j
-    10:242:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1743 -> j
-    243:247:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1743:1747 -> j
+    10:242:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720 -> j
+    243:247:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720:1724 -> j
     248:480:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> j
-    248:480:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1747 -> j
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():1435:1435 -> keySet
-    2:2:java.util.Set keySet():1435:1435 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
+    248:480:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1724 -> j
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1743 -> k
+    10:242:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> k
+    10:242:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1743 -> k
+    243:247:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1743:1747 -> k
+    248:480:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> k
+    248:480:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1747 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     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.u.a.a.a.f.L:
+    1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.t.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
@@ -42661,9 +43166,7 @@
     3:3:boolean isEmpty():1544 -> isEmpty
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1778:1778 -> isEmpty
     4:4:boolean isEmpty():1544 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1497:1497 -> iterator
-    2:2:java.util.Iterator iterator():1497:1497 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1500:1500 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1500:1500 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1559:1559 -> last
     1:1:java.lang.Object last():1497 -> last
     1:5:boolean remove(java.lang.Object):1526:1530 -> remove
@@ -42674,22 +43177,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.u.a.a.a.f.M:
+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 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
-    1:1: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: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.u.a.a.a.f.K$d$a:
+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 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.u.a.a.a.f.K$d$b:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.t.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
@@ -42701,7 +43201,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.u.a.a.a.f.K$d$c:
+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 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 -> m
@@ -42712,7 +43212,7 @@
     3:235:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):0:232 -> n
     3:235:void updatePrevious():1798 -> n
     236:236:void updatePrevious():1798:1798 -> n
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.u.a.a.a.f.K$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.t.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
@@ -42726,14 +43226,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.u.a.a.a.f.K$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.t.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.u.a.a.a.f.K$e:
+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$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
@@ -42750,14 +43250,14 @@
     1:1:int nextIndex():1088:1088 -> nextIndex
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.t.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.u.a.a.a.f.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.t.a.a.a.f.P:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -42765,11 +43265,11 @@
     4:6:void <init>(int):81:83 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,int):37:37 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():231:231 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():37 -> a
-    4:4:boolean containsKey(int):265:265 -> a
-    5:24:java.lang.Object put(int,java.lang.Object):283:302 -> a
+    3:3:boolean containsKey(int):265:265 -> a
+    4:23:java.lang.Object put(int,java.lang.Object):283:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():231:231 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():37 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):37:37 -> c
     1:4:void clear():257:260 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap clone():344:349 -> clone
@@ -42781,14 +43281,12 @@
     2:4:int findKey(int):235:237 -> d
     1:4:java.lang.Object get(int):244:247 -> get
     1:1:boolean isEmpty():277:277 -> isEmpty
-    1:1:java.util.Set keySet():37:37 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():321:321 -> keySet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():321:321 -> keySet
     1:8:java.lang.Object remove(int):308:315 -> remove
     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.u.a.a.a.f.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.f.P$a:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.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 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>
@@ -42798,7 +43296,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.u.a.a.a.f.O:
+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 this$1 -> c
     int next -> b
     int curr -> a
@@ -42807,28 +43305,28 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.u.a.a.a.f.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.t.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.u.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.u.a.a.a.f.S$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.objects.ObjectSet int2ReferenceEntrySet() -> b
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.t.a.a.a.f.S$a:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.f.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.u.a.a.a.f.V:
+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.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.u.a.a.a.f.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.t.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
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():62:62 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():62:62 -> b
     void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.clear() -> clear
     1:1:java.lang.Object clone():95:95 -> clone
     1:1:java.util.Set entrySet():43:43 -> entrySet
     1:2:boolean equals(java.lang.Object):110:111 -> equals
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.get(int) -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> i
     1:1:java.util.Set keySet():43:43 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():80:80 -> keySet
     1:1:void putAll(java.util.Map):56:56 -> putAll
@@ -42836,7 +43334,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.u.a.a.a.f.X:
+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.objects.ReferenceCollection values -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> i
     java.lang.Object[] value -> c
@@ -42858,8 +43356,8 @@
     3:18:java.lang.Object put(int,java.lang.Object):271 -> a
     19:21:java.lang.Object put(int,java.lang.Object):272:274 -> a
     22:31:boolean containsKey(int):344:353 -> a
-    32:33:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():707:708 -> a
-    32:33:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():49 -> a
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet int2ReferenceEntrySet():707:708 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():49 -> b
     1:5:void clear():377:381 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap clone():945:954 -> clone
     1:10:java.lang.Object clone():49 -> clone
@@ -42880,10 +43378,9 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
     2:10:int hashCode():972:980 -> hashCode
-    1:5:java.lang.Object removeNullEntry():228:232 -> i
     1:1:boolean isEmpty():391:391 -> isEmpty
-    1:1:java.util.Set keySet():49:49 -> keySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():768:769 -> keySet
+    1:5:java.lang.Object removeNullEntry():228:232 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():768:769 -> keySet
     1:1:void putAll(java.util.Map):238:238 -> putAll
     2:3:void ensureCapacity(int):209:210 -> putAll
     2:3:void putAll(java.util.Map):238 -> putAll
@@ -42895,17 +43392,15 @@
     8:8:void putAll(java.util.Map):243:243 -> putAll
     1:12:java.lang.Object remove(int):309:320 -> remove
     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.u.a.a.a.f.W:
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.t.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
     1:1:boolean contains(java.lang.Object):807:807 -> contains
-    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: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.u.a.a.a.f.X$a:
+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 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>
@@ -42913,23 +43408,22 @@
     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.u.a.a.a.f.X$b:
+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 this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> i
     1:1:java.lang.Integer next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.f.X$c:
+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 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>
     1:1:boolean contains(int):750:750 -> b
     1:1:void clear():762:762 -> clear
-    1:1:java.util.Iterator iterator():737:737 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.f.X$d:
+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 this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -42941,17 +43435,16 @@
     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.u.a.a.a.f.X$e:
+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 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>
     1:1:void clear():701:701 -> clear
     1:16:boolean contains(java.lang.Object):637:652 -> contains
-    1:1:java.util.Iterator iterator():625:625 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.f.X$f:
+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.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -42969,11 +43462,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.X$g:
+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 this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.u.a.a.a.f.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.t.a.a.a.f.d0:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -42986,54 +43479,52 @@
     int count -> c
     1:1:void <init>():81:81 -> <init>
     2:10:void <init>():75:83 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():43:43 -> a
-    2:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):310:320 -> a
-    2:12:java.lang.Object put(int,java.lang.Object):288 -> a
-    13:13:int compare(int,int):234:234 -> a
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):320 -> a
-    13:13:java.lang.Object put(int,java.lang.Object):288 -> a
-    14:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):324:334 -> a
-    14:24:java.lang.Object put(int,java.lang.Object):288 -> a
-    25:26:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):837:838 -> a
-    25:26:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):335 -> a
-    25:26:java.lang.Object put(int,java.lang.Object):288 -> a
-    27:34:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):338:345 -> a
-    27:34:java.lang.Object put(int,java.lang.Object):288 -> a
-    35:36:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):826:827 -> a
-    35:36:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):346 -> a
-    35:36:java.lang.Object put(int,java.lang.Object):288 -> a
-    37:57:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):352:372 -> a
-    37:57:java.lang.Object put(int,java.lang.Object):288 -> a
-    58:59:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):815:816 -> a
-    58:59:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):373 -> a
-    58:59:java.lang.Object put(int,java.lang.Object):288 -> a
-    60:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):376:387 -> a
-    60:71:java.lang.Object put(int,java.lang.Object):288 -> a
-    72:73:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):804:805 -> a
-    72:73:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):388 -> a
-    72:73:java.lang.Object put(int,java.lang.Object):288 -> a
-    74:90:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):393:409 -> a
-    74:90:java.lang.Object put(int,java.lang.Object):288 -> a
-    91:92:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):804:805 -> a
-    91:92:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):410 -> a
-    91:92:java.lang.Object put(int,java.lang.Object):288 -> a
-    93:104:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):413:424 -> a
-    93:104:java.lang.Object put(int,java.lang.Object):288 -> a
-    105:106:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):815:816 -> a
-    105:106:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):425 -> a
-    105:106:java.lang.Object put(int,java.lang.Object):288 -> a
-    107:110:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):432:435 -> a
-    107:110:java.lang.Object put(int,java.lang.Object):288 -> a
-    111:112:java.lang.Object put(int,java.lang.Object):289:290 -> a
-    113:113:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):349:349 -> a
-    113:113:java.lang.Object put(int,java.lang.Object):288 -> a
-    114:114:boolean containsKey(int):946:946 -> a
-    115:193:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1127:1205 -> a
-    194:194:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1389:1389 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1384:1384 -> b
+    1:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):310:320 -> a
+    1:11:java.lang.Object put(int,java.lang.Object):288 -> a
+    12:12:int compare(int,int):234:234 -> a
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):320 -> a
+    12:12:java.lang.Object put(int,java.lang.Object):288 -> a
+    13:23:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):324:334 -> a
+    13:23:java.lang.Object put(int,java.lang.Object):288 -> a
+    24:25:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):837:838 -> a
+    24:25:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):335 -> a
+    24:25:java.lang.Object put(int,java.lang.Object):288 -> a
+    26:33:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):338:345 -> a
+    26:33:java.lang.Object put(int,java.lang.Object):288 -> a
+    34:35:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):826:827 -> a
+    34:35:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):346 -> a
+    34:35:java.lang.Object put(int,java.lang.Object):288 -> a
+    36:56:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):352:372 -> a
+    36:56:java.lang.Object put(int,java.lang.Object):288 -> a
+    57:58:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):815:816 -> a
+    57:58:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):373 -> a
+    57:58:java.lang.Object put(int,java.lang.Object):288 -> a
+    59:70:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):376:387 -> a
+    59:70:java.lang.Object put(int,java.lang.Object):288 -> a
+    71:72:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):804:805 -> a
+    71:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):388 -> a
+    71:72:java.lang.Object put(int,java.lang.Object):288 -> a
+    73:89:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):393:409 -> a
+    73:89:java.lang.Object put(int,java.lang.Object):288 -> a
+    90:91:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):804:805 -> a
+    90:91:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):410 -> a
+    90:91:java.lang.Object put(int,java.lang.Object):288 -> a
+    92:103:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):413:424 -> a
+    92:103:java.lang.Object put(int,java.lang.Object):288 -> a
+    104:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry):815:816 -> a
+    104:105:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):425 -> a
+    104:105:java.lang.Object put(int,java.lang.Object):288 -> a
+    106:109:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):432:435 -> a
+    106:109:java.lang.Object put(int,java.lang.Object):288 -> a
+    110:111:java.lang.Object put(int,java.lang.Object):289:290 -> a
+    112:112:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry add(int):349:349 -> a
+    112:112:java.lang.Object put(int,java.lang.Object):288 -> a
+    113:113:boolean containsKey(int):946:946 -> a
+    114:114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1389:1389 -> a
+    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1127:1205 -> b
+    80:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1384:1384 -> b
     1:1:int compare(int,int):234:234 -> c
-    2:4:int firstIntKey():967:967 -> c
-    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1379:1379 -> c
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1379:1379 -> c
     1:6:void clear():679:684 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap clone():1913:1919 -> clone
     1:7:java.lang.Object clone():43 -> clone
@@ -43065,17 +43556,16 @@
     4:4:int compare(int,int):234:234 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):249 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):250:250 -> d
+    6:8:int firstIntKey():967:967 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):264:266 -> e
     4:4:int compare(int,int):234:234 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):266 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):268:268 -> e
-    1:3:int lastIntKey():973:973 -> g
     1:2:java.lang.Object get(int):961:962 -> get
-    1:2:void allocatePaths():282:283 -> i
+    1:3:int lastIntKey():973:973 -> h
     1:1:boolean isEmpty():956:956 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():43:43 -> keySet
-    2:2:java.util.Set keySet():43:43 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1298:1299 -> keySet
+    1:2:void allocatePaths():282:283 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1298:1299 -> keySet
     1:8:java.lang.Object remove(int):449:456 -> remove
     9:9:int compare(int,int):234:234 -> remove
     9:9:java.lang.Object remove(int):456 -> remove
@@ -43097,10 +43587,9 @@
     212:255:java.lang.Object remove(int):619:662 -> remove
     256:272:java.lang.Object remove(int):457:473 -> remove
     1:1:int size():951:951 -> size
-    1:1:java.util.Collection values():43:43 -> values
-    2:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.u.a.a.a.f.Y:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.u.a.a.a.f.a0:
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.t.a.a.a.f.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.t.a.a.a.f.a0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -43112,9 +43601,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1127:1127 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1197:1197 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1127 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1127:1127 -> iterator
-    2:2:java.util.Iterator iterator():1127:1127 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1141:1141 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1141:1141 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1187:1187 -> last
     1:1:java.lang.Object last():1127 -> last
     1:5:boolean remove(java.lang.Object):1162:1166 -> remove
@@ -43125,21 +43612,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.u.a.a.a.f.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.t.a.a.a.f.Z:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.u.a.a.a.f.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.t.a.a.a.f.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
-    1:1:java.util.Iterator iterator():1348:1348 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.u.a.a.a.f.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.t.a.a.a.f.c0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -43166,7 +43652,7 @@
     1:1:boolean succ():770:770 -> i
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.u.a.a.a.f.d0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.t.a.a.a.f.d0$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -43178,7 +43664,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.u.a.a.a.f.d0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.t.a.a.a.f.d0$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void add(java.lang.Integer):1267:1267 -> add
@@ -43192,14 +43678,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.u.a.a.a.f.d0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.t.a.a.a.f.d0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1274:1274 -> iterator
-    2:2:java.util.Iterator iterator():1274:1274 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.u.a.a.a.f.d0$d:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.t.a.a.a.f.d0$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
@@ -43209,29 +43693,26 @@
     int to -> c
     boolean bottom -> d
     1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,int,boolean,int,boolean):1434:1440 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():1403:1403 -> a
-    2:82:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1465:1545 -> a
-    83:83:boolean containsKey(int):1589:1589 -> a
-    84:84:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.containsKey(int):946:946 -> a
-    84:84:boolean containsKey(int):1589 -> a
-    85:88:java.lang.Object put(int,java.lang.Object):1613:1616 -> a
-    89:90:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1663:1664 -> a
-    91:325:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> a
-    91:325:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1664 -> a
-    326:327:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1664:1665 -> a
-    328:562:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> a
-    328:562:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665 -> a
-    563:565:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665:1667 -> a
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1657:1658 -> b
-    3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> b
-    3:237:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658 -> b
-    238:238:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658:1658 -> b
+    1:1:boolean containsKey(int):1589:1589 -> a
+    2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.containsKey(int):946:946 -> a
+    2:2:boolean containsKey(int):1589 -> a
+    3:6:java.lang.Object put(int,java.lang.Object):1613:1616 -> a
+    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1663:1664 -> a
+    9:243:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> a
+    9:243:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1664 -> a
+    244:245:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1664:1665 -> a
+    246:480:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> a
+    246:480:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665 -> a
+    481:483:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):1665:1667 -> a
+    1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1465:1545 -> b
+    82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1657:1658 -> b
+    84:318:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> b
+    84:318:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658 -> b
+    319:319:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1658:1658 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1651:1652 -> c
     3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> c
     3:237:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652 -> c
     238:238:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652:1652 -> c
-    239:241:int firstIntKey():1718:1720 -> c
-    242:242:int firstIntKey():1719:1719 -> c
     1:4:void clear():1445:1448 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1646:1646 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1646:1646 -> comparator
@@ -43243,15 +43724,11 @@
     237:237:boolean in(int):1460:1460 -> d
     238:472:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> d
     238:472:boolean in(int):1460 -> d
-    1:3:int lastIntKey():1725:1727 -> g
-    4:4:int lastIntKey():1726:1726 -> g
+    473:475:int firstIntKey():1718:1720 -> d
+    476:476:int firstIntKey():1719:1719 -> d
     1:1:java.lang.Object get(int):1608:1608 -> get
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> i
-    10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> i
-    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> i
-    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> i
-    250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> i
-    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> i
+    1:3:int lastIntKey():1725:1727 -> h
+    4:4:int lastIntKey():1726:1726 -> h
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1742 -> isEmpty
     1:1:boolean isEmpty():1641 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1009:1009 -> isEmpty
@@ -43259,20 +43736,23 @@
     2:2:boolean isEmpty():1641 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1743:1743 -> isEmpty
     3:3:boolean isEmpty():1641 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1708 -> j
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> j
     10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> j
-    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708 -> j
-    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708:1712 -> j
+    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> j
+    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> j
     250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> j
-    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1712 -> j
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():1403:1403 -> keySet
-    2:2:java.util.Set keySet():1403:1403 -> keySet
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1560:1561 -> keySet
+    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> j
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1708 -> k
+    10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> k
+    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708 -> k
+    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708:1712 -> k
+    250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> k
+    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1712 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1560:1561 -> keySet
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
-    1:1:java.util.Collection values():1403:1403 -> values
-    2:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.u.a.a.a.f.e0:
+    1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.t.a.a.a.f.e0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -43291,9 +43771,7 @@
     3:3:boolean isEmpty():1512 -> isEmpty
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1743:1743 -> isEmpty
     4:4:boolean isEmpty():1512 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1465:1465 -> iterator
-    2:2:java.util.Iterator iterator():1465:1465 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1468:1468 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1468:1468 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry last():1527:1527 -> last
     1:1:java.lang.Object last():1465 -> last
     1:5:boolean remove(java.lang.Object):1494:1498 -> remove
@@ -43304,22 +43782,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.u.a.a.a.f.f0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.t.a.a.a.f.f0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
-    1:1:java.util.Iterator iterator():1566:1566 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.u.a.a.a.f.d0$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.t.a.a.a.f.d0$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1548:1548 -> iterator
-    2:2:java.util.Iterator iterator():1548:1548 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.u.a.a.a.f.d0$d$b:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.t.a.a.a.f.d0$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -43331,7 +43806,7 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.u.a.a.a.f.d0$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.t.a.a.a.f.d0$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:2:void updateNext():1767:1768 -> m
@@ -43342,7 +43817,7 @@
     3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> n
     3:237:void updatePrevious():1763 -> n
     238:238:void updatePrevious():1763:1763 -> n
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.u.a.a.a.f.d0$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.t.a.a.a.f.d0$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void add(java.lang.Integer):1861:1861 -> add
@@ -43356,14 +43831,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.u.a.a.a.f.d0$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.t.a.a.a.f.d0$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.u.a.a.a.f.d0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.t.a.a.a.f.d0$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> c
@@ -43380,43 +43855,43 @@
     1:1:int nextIndex():1054:1054 -> nextIndex
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.u.a.a.a.f.d0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.t.a.a.a.f.d0$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.u.a.a.a.f.g0:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.f.g0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
-    int firstIntKey() -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
-    int lastIntKey() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.u.a.a.a.f.i0:
+    int firstIntKey() -> d
+    int lastIntKey() -> h
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.t.a.a.a.f.i0:
     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.u.a.a.a.f.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.t.a.a.a.f.h0:
     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
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> a
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> b
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet():57 -> b
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():71:71 -> b
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):101:101 -> c
-    2:2:int firstIntKey():112:112 -> c
+    1:1:int firstIntKey():112:112 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():84:84 -> entrySet
     1:1:java.util.Set entrySet():57 -> entrySet
     1:1:int firstIntKey():112:112 -> firstKey
     1:1:java.lang.Integer firstKey():165 -> firstKey
     1:1:java.lang.Object firstKey():57 -> firstKey
-    1:1:int lastIntKey():117:117 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():84:84 -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57 -> h
+    1:1:int lastIntKey():117:117 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):57:57 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129:129 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):57 -> headMap
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():84:84 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():89:89 -> keySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():57 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():89:89 -> keySet
@@ -43431,7 +43906,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141:141 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.u.a.a.a.f.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.t.a.a.a.f.k0:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -43473,7 +43948,7 @@
     6:6:void grow(int):250:250 -> m
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.u.a.a.a.f.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.t.a.a.a.f.j0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -43488,7 +43963,7 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.u.a.a.a.f.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.t.a.a.a.f.m0:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -43510,25 +43985,25 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.u.a.a.a.f.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.t.a.a.a.f.l0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> i
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.u.a.a.a.f.n0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.t.a.a.a.f.n0:
     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.u.a.a.a.f.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.t.a.a.a.f.o0:
     int previousInt() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.u.a.a.a.f.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.t.a.a.a.f.p0:
     boolean add(int) -> a
     int[] toIntArray() -> a
     boolean contains(int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.u.a.a.a.f.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.t.a.a.a.f.s0:
     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.u.a.a.a.f.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.t.a.a.a.f.q0:
     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
@@ -43539,7 +44014,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.u.a.a.a.f.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.t.a.a.a.f.r0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -43563,18 +44038,18 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.u.a.a.a.f.t0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.u.a.a.a.f.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.t.a.a.a.f.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.t.a.a.a.f.u0:
     int nextInt() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.u.a.a.a.f.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.t.a.a.a.f.y0:
     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.u.a.a.a.f.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.t.a.a.a.f.v0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> e
     1:1:int nextInt():57:57 -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.u.a.a.a.f.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.t.a.a.a.f.w0:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -43584,12 +44059,12 @@
     1:4:int nextInt():126:126 -> i
     1:1:int nextIndex():140:140 -> nextIndex
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.u.a.a.a.f.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.t.a.a.a.f.x0:
     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 -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.u.a.a.a.f.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.t.a.a.a.f.z0:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
@@ -43598,13 +44073,13 @@
     int set(int,int) -> c
     int removeInt(int) -> d
     int getInt(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.u.a.a.a.f.A0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.u.a.a.a.f.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.t.a.a.a.f.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.t.a.a.a.f.C0:
     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.u.a.a.a.f.B0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.u.a.a.a.f.C0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.t.a.a.a.f.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.t.a.a.a.f.C0$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
@@ -43644,7 +44119,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):62 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList 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.u.a.a.a.f.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.t.a.a.a.f.D0:
     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>
@@ -43668,14 +44143,13 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382:383 -> l
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> l
     1:1:java.util.ListIterator listIterator():332:332 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):332:332 -> listIterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> listIterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.singleton(int):159:159 -> listIterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371 -> listIterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> listIterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.singleton(int):159:159 -> listIterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371 -> listIterator
     1:1:boolean removeAll(java.util.Collection):409:409 -> removeAll
     1:1:boolean retainAll(java.util.Collection):414:414 -> retainAll
     1:1:java.util.List subList(int,int):332:332 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.u.a.a.a.f.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.t.a.a.a.f.G0:
     float f -> g
     int size -> f
     int n -> d
@@ -43722,15 +44196,14 @@
     9:13:void shiftKeys(int):339:343 -> i
     9:13:boolean removeEntry(int):349 -> i
     1:1:boolean isEmpty():417:417 -> isEmpty
-    1:1:java.util.Iterator iterator():40:40 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():547:547 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():547:547 -> iterator
     1:1:boolean remove(int):365:365 -> remove
     2:5:boolean removeNullEntry():355:358 -> remove
     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.u.a.a.a.f.E0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.u.a.a.a.f.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.t.a.a.a.f.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.t.a.a.a.f.F0:
     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
@@ -43748,21 +44221,21 @@
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.u.a.a.a.f.H0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.u.a.a.a.f.J0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.t.a.a.a.f.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.t.a.a.a.f.J0:
     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.u.a.a.a.f.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.t.a.a.a.f.I0:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> g
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.u.a.a.a.f.K0:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.u.a.a.a.f.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.t.a.a.a.f.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.t.a.a.a.f.M0:
     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.u.a.a.a.f.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.t.a.a.a.f.L0:
     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
@@ -43778,8 +44251,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.u.a.a.a.f.N0:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.u.a.a.a.g.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.t.a.a.a.f.N0:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.t.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
@@ -43793,10 +44266,10 @@
     5:5:boolean equals(java.lang.Object):299:299 -> equals
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.get(java.lang.Object):120:121 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():707:708 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():707:708 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> i
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):135:137 -> put
@@ -43819,7 +44292,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.u.a.a.a.g.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongBidirectionalIterator -> com.android.tools.r8.t.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 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.nextLong() -> a
@@ -43830,7 +44303,7 @@
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongIterator.next():0 -> next
     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.u.a.a.a.g.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongCollection -> com.android.tools.r8.t.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
@@ -43840,9 +44313,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator() -> c
     1:4:boolean rem(long):94:97 -> c
     1:1:boolean contains(java.lang.Object):129:129 -> contains
+    1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.iterator():737:737 -> iterator
     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.u.a.a.a.g.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList -> com.android.tools.r8.t.a.a.a.g.f:
     1:1:void <init>():33:33 -> <init>
     void add(int,long) -> a
     void removeElements(int,int) -> a
@@ -43930,7 +44404,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.u.a.a.a.g.e:
+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.LongList l -> a
     int from -> b
     int to -> c
@@ -43981,7 +44455,7 @@
     5:5:java.lang.Object set(int,java.lang.Object):725 -> set
     1:1:int size():791:791 -> size
     1:1:java.util.List subList(int,int):725:725 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList$LongSubList$1 -> com.android.tools.r8.u.a.a.a.g.d:
+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 this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -43998,7 +44472,7 @@
     1:1:int nextIndex():843:843 -> nextIndex
     1:1:int previousIndex():847:847 -> previousIndex
     1:11:void remove():863:863 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.u.a.a.a.g.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongListIterator -> com.android.tools.r8.t.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
@@ -44008,7 +44482,7 @@
     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.u.a.a.a.g.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongSet -> com.android.tools.r8.t.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
@@ -44018,10 +44492,10 @@
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.size():745:745 -> hashCode
     2:2:int hashCode():57 -> hashCode
     3:8:int hashCode():58:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.u.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.u.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.u.a.a.a.g.m:
+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.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -44062,8 +44536,8 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
     2:10:int hashCode():972:980 -> hashCode
-    1:5:java.lang.Object removeNullEntry():228:232 -> i
     1:1:boolean isEmpty():391:391 -> isEmpty
+    1:5:java.lang.Object removeNullEntry():228:232 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet keySet():768:769 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):238:238 -> putAll
@@ -44078,15 +44552,14 @@
     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.u.a.a.a.g.l:
+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 this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
-    1:1: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: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.u.a.a.a.g.m$a:
+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$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>
@@ -44094,22 +44567,21 @@
     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.u.a.a.a.g.m$b:
+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 this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.g.m$c:
+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 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>
     1:1:boolean contains(long):750:750 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> c
     1:1:void clear():762:762 -> clear
-    1:1:java.util.Iterator iterator():737:737 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.g.m$d:
+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 this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -44120,17 +44592,16 @@
     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.u.a.a.a.g.m$e:
+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 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>
     1:1:void clear():701:701 -> clear
     1:16:boolean contains(java.lang.Object):637:652 -> contains
-    1:1:java.util.Iterator iterator():625:625 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.g.m$f:
+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 this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -44148,11 +44619,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.g.m$g:
+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 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.u.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.t.a.a.a.g.o:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -44178,7 +44649,7 @@
     1:2:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.u.a.a.a.g.n:
+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 this$0 -> d
     int last -> b
     int val$index -> c
@@ -44193,19 +44664,19 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.u.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.t.a.a.a.g.p:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.u.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.u.a.a.a.g.r:
+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:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.u.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.t.a.a.a.g.s:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long getLong(int) -> c
     long removeLong(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.u.a.a.a.g.t:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.u.a.a.a.h.b:
+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:
     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
@@ -44264,7 +44735,7 @@
     21:21:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
     21:21:java.lang.String toString():341 -> toString
     22:25:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.u.a.a.a.h.a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
     1:3:void <init>(java.lang.Object,boolean):121:123 -> <init>
@@ -44281,7 +44752,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.u.a.a.a.h.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap -> com.android.tools.r8.t.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>
@@ -44297,8 +44768,9 @@
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
+    1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.keySet():37:37 -> keySet
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Integer):123:125 -> put
@@ -44314,7 +44786,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.u.a.a.a.h.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.c:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -44331,7 +44803,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.u.a.a.a.h.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap -> com.android.tools.r8.t.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:java.util.Set entrySet():31 -> entrySet
@@ -44339,13 +44811,13 @@
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> entrySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     2:3:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.u.a.a.a.h.f:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.t.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
@@ -44370,10 +44842,10 @@
     13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
@@ -44392,7 +44864,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.u.a.a.a.h.g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectMap -> com.android.tools.r8.t.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
@@ -44424,62 +44896,74 @@
     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.u.a.a.a.h.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap -> com.android.tools.r8.t.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.AbstractObject2ReferenceMap -> com.android.tools.r8.u.a.a.a.h.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap -> com.android.tools.r8.t.a.a.a.h.j:
+    java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.defRetValue -> a
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
-    1:3:boolean equals(java.lang.Object):272:274 -> equals
-    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.size():730:730 -> equals
-    4:4:boolean equals(java.lang.Object):274 -> equals
-    5:5:boolean equals(java.lang.Object):275:275 -> equals
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> equals
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
-    6:6:boolean equals(java.lang.Object):275 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> equals
-    7:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
-    7:8:boolean equals(java.lang.Object):275 -> equals
-    9:9:boolean equals(java.lang.Object):275:275 -> equals
+    void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.clear() -> clear
+    1:4:boolean equals(java.lang.Object):272:275 -> equals
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> equals
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> equals
+    5:5:boolean equals(java.lang.Object):275 -> equals
+    6:6:boolean equals(java.lang.Object):275:275 -> equals
+    1:2:int hashCode():262:263 -> hashCode
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> hashCode
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> hashCode
+    3:3:int hashCode():263 -> hashCode
+    4:6:int hashCode():263:265 -> hashCode
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceFunction.put(java.lang.Object,java.lang.Object) -> put
     1:13:void putAll(java.util.Map):69:81 -> putAll
     1:2:java.lang.String toString():280:281 -> toString
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> toString
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> toString
     3:3:java.lang.String toString():281 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> toString
-    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():31 -> toString
-    4:5:java.lang.String toString():281 -> toString
-    6:6:java.lang.String toString():281:281 -> toString
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet.iterator():1197:1197 -> toString
-    7:7:java.lang.String toString():281 -> toString
-    8:8:java.lang.String toString():282:282 -> toString
-    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.size():730:730 -> toString
-    9:9:java.lang.String toString():282 -> toString
-    10:22:java.lang.String toString():285:297 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap -> com.android.tools.r8.u.a.a.a.h.j:
+    4:20:java.lang.String toString():281:297 -> toString
+    1:1:java.util.Collection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.values():85:85 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.i:
+    java.lang.Object value -> b
+    java.lang.Object key -> a
+    1:3:void <init>(java.lang.Object,java.lang.Object):103:105 -> <init>
+    1:1:java.lang.Object getKey():110:110 -> getKey
+    1:1:java.lang.Object getValue():115:115 -> getValue
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.h.k:
     1:1:void <init>():34:34 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.object2ReferenceEntrySet():1366:1366 -> a
     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:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> entrySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> entrySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():226 -> entrySet
-    2:3:java.util.Set entrySet():31 -> entrySet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.u.a.a.a.h.k:
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.headMap(java.lang.Object):1366:1366 -> headMap
+    1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.keySet():85:85 -> keySet
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.subMap(java.lang.Object,java.lang.Object):1366:1366 -> subMap
+    1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap.tailMap(java.lang.Object):1366:1366 -> tailMap
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap$KeySet -> com.android.tools.r8.t.a.a.a.h.k$a:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap):58:58 -> <init>
+    1:1:void clear():71:71 -> clear
+    1:1:java.util.Comparator comparator():76:76 -> comparator
+    1:1:boolean contains(java.lang.Object):61:61 -> contains
+    1:1:java.lang.Object first():81:81 -> first
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(java.lang.Object):91:91 -> headSet
+    1:1:java.util.SortedSet headSet(java.lang.Object):58 -> headSet
+    1:1:java.lang.Object last():86:86 -> last
+    1:1:int size():66:66 -> size
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet subSet(java.lang.Object,java.lang.Object):101:101 -> subSet
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):58 -> subSet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):96:96 -> tailSet
+    1:1:java.util.SortedSet tailSet(java.lang.Object):58 -> tailSet
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.t.a.a.a.h.l:
     1:1:void <init>():37:37 -> <init>
+    1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet.iterator():689:689 -> iterator
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.u.a.a.a.h.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectIterator -> com.android.tools.r8.t.a.a.a.h.m:
     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.u.a.a.a.h.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList -> com.android.tools.r8.t.a.a.a.h.p:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:1:int compareTo(java.util.List):458:458 -> a
@@ -44532,7 +45016,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.u.a.a.a.h.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList -> com.android.tools.r8.t.a.a.a.h.o:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList l -> a
     int from -> b
     int to -> c
@@ -44564,7 +45048,7 @@
     1:2:java.lang.Object set(int,java.lang.Object):580:581 -> set
     1:1:int size():586:586 -> size
     1:1:java.util.List subList(int,int):520:520 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.u.a.a.a.h.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList$1 -> com.android.tools.r8.t.a.a.a.h.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList$ObjectSubList this$0 -> d
     boolean $assertionsDisabled -> e
     int last -> b
@@ -44581,18 +45065,20 @@
     1:1:int previousIndex():642:642 -> previousIndex
     1:11:void remove():658:658 -> remove
     1:3:void set(java.lang.Object):653:653 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.u.a.a.a.h.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectListIterator -> com.android.tools.r8.t.a.a.a.h.q:
     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.u.a.a.a.h.q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSet -> com.android.tools.r8.t.a.a.a.h.r:
     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.u.a.a.a.h.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectSortedSet -> com.android.tools.r8.t.a.a.a.h.s:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.u.a.a.a.h.s:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():1161:1161 -> iterator
+    2:2:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.iterator():1161:1161 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap -> com.android.tools.r8.t.a.a.a.h.t:
     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
@@ -44608,10 +45094,10 @@
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
@@ -44636,7 +45122,7 @@
     13:13:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.getBooleanValue():442:442 -> toString
     13:13:java.lang.String toString():341 -> toString
     14:17:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.u.a.a.a.h.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap -> com.android.tools.r8.t.a.a.a.h.v:
     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>
@@ -44652,8 +45138,9 @@
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
+    1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.keySet():37:37 -> keySet
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Integer):123:125 -> put
@@ -44669,7 +45156,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.u.a.a.a.h.t:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntMap$BasicEntry -> com.android.tools.r8.t.a.a.a.h.u:
     java.lang.Object key -> a
     int value -> b
     1:3:void <init>(java.lang.Object,int):121:123 -> <init>
@@ -44686,19 +45173,19 @@
     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.u.a.a.a.h.v:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap -> com.android.tools.r8.t.a.a.a.h.w:
     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: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.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> h
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> h
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.u.a.a.a.h.w:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229:229 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> i
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():229 -> i
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.t.a.a.a.h.x:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
     boolean containsValue(long) -> a
@@ -44714,10 +45201,10 @@
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> h
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> i
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
@@ -44742,10 +45229,11 @@
     13:13:long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.getLongValue():487:487 -> toString
     13:13:java.lang.String toString():341 -> toString
     14:17:java.lang.String toString():341:344 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.u.a.a.a.h.x:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceCollection -> com.android.tools.r8.t.a.a.a.h.y:
     1:1:void <init>():37:37 -> <init>
+    1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3.iterator():1384:1384 -> iterator
     1:15:java.lang.String toString():61:75 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.u.a.a.a.h.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList -> com.android.tools.r8.t.a.a.a.h.B:
     1:1:void <init>():34:34 -> <init>
     void removeElements(int,int) -> a
     1:5:boolean addAll(int,java.util.Collection):121:125 -> addAll
@@ -44785,7 +45273,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.u.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList -> com.android.tools.r8.t.a.a.a.h.A:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList l -> a
     int from -> b
     int to -> c
@@ -44816,7 +45304,7 @@
     1:2:java.lang.Object set(int,java.lang.Object):539:540 -> set
     1:1:int size():545:545 -> size
     1:1:java.util.List subList(int,int):479:479 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.u.a.a.a.h.y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList$1 -> com.android.tools.r8.t.a.a.a.h.z:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList$ReferenceSubList this$0 -> d
     int last -> b
@@ -44833,13 +45321,13 @@
     1:1:int previousIndex():601:601 -> previousIndex
     1:11:void remove():617:617 -> remove
     1:3:void set(java.lang.Object):612:612 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.u.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSet -> com.android.tools.r8.t.a.a.a.h.C:
     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.u.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.t.a.a.a.h.D:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.u.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.t.a.a.a.h.G:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -44860,16 +45348,16 @@
     1:1:boolean[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> d
     2:4:int findKey(java.lang.Object):235:237 -> d
     1:3:boolean getBoolean(java.lang.Object):244:246 -> e
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet object2BooleanEntrySet():231:231 -> h
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet object2BooleanEntrySet():231:231 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> i
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:java.util.Set keySet():37:37 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
     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.u.a.a.a.h.D:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.F$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.t.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.G$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>
@@ -44879,7 +45367,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.u.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.t.a.a.a.h.F:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -44888,9 +45376,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.u.a.a.a.h.G:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.u.a.a.a.h.G$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.u.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.t.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.t.a.a.a.h.H$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.t.a.a.a.h.K:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -44913,16 +45401,15 @@
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> d
     2:3:boolean containsValue(int):270:271 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():231:231 -> f
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():231:231 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> g
     1:1:boolean isEmpty():277:277 -> isEmpty
-    1:1:java.util.Set keySet():37:37 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
     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.u.a.a.a.h.H:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.J$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.t.a.a.a.h.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.K$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>
@@ -44932,7 +45419,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.u.a.a.a.h.I:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.t.a.a.a.h.J:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -44941,10 +45428,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.u.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.t.a.a.a.h.L:
     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.u.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.t.a.a.a.h.N:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -44979,10 +45466,10 @@
     1:11:boolean containsKey(java.lang.Object):738:748 -> containsKey
     1:5:boolean containsValue(int):754:758 -> d
     1:25:void fixPointers(int):899:923 -> f
-    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet object2IntEntrySet():1422:1423 -> f
-    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
-    1:42:void rehash(int):1709:1750 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet object2IntEntrySet():1422:1423 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> g
+    3:44:void rehash(int):1709:1750 -> g
     1:3:int removeEntry(int):276:278 -> h
     4:9:void shiftKeys(int):410:415 -> h
     4:9:int removeEntry(int):279 -> h
@@ -44994,8 +45481,8 @@
     2:10:int hashCode():1796:1804 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
-    1:6:int removeNullEntry():285:290 -> i
     1:1:boolean isEmpty():785:785 -> isEmpty
+    1:6:int removeNullEntry():285:290 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1531:1532 -> keySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():87 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1531:1532 -> keySet
@@ -45017,15 +45504,14 @@
     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.u.a.a.a.h.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.M:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
-    1:1: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: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.u.a.a.a.h.M$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.N$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>
@@ -45040,14 +45526,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.u.a.a.a.h.M$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.N$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.u.a.a.a.h.M$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.N$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>
@@ -45067,7 +45553,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.u.a.a.a.h.M$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.N$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>
@@ -45086,7 +45572,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.u.a.a.a.h.M$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.N$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>
@@ -45097,9 +45583,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1269:1269 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1286:1286 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1269 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1269:1269 -> iterator
-    2:2:java.util.Iterator iterator():1269:1269 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry last():1302:1302 -> last
     1:3:java.lang.Object last():1269 -> last
     1:29:boolean remove(java.lang.Object):1331:1359 -> remove
@@ -45110,7 +45594,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.u.a.a.a.h.M$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.N$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -45128,7 +45612,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.M$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.N$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
@@ -45143,11 +45627,11 @@
     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.u.a.a.a.h.P:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.u.a.a.a.h.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.O:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.t.a.a.a.h.Q:
+    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.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.t.a.a.a.h.T:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -45175,25 +45659,24 @@
     11:11:java.lang.Object clone():49 -> clone
     1:11:boolean containsKey(java.lang.Object):388:398 -> containsKey
     1:5:boolean containsValue(int):404:408 -> d
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():761:762 -> f
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> f
-    3:9:void rehash(int):961:967 -> f
-    10:10:int realSize():205:205 -> f
-    10:10:void rehash(int):968 -> f
-    11:23:void rehash(int):969:981 -> f
+    1:7:void rehash(int):961:967 -> f
+    8:8:int realSize():205:205 -> f
+    8:8:void rehash(int):968 -> f
+    9:21:void rehash(int):969:981 -> f
     1:2:int removeEntry(int):219:220 -> g
     3:8:void shiftKeys(int):333:338 -> g
     3:8:int removeEntry(int):221 -> g
     9:9:int removeEntry(int):222:222 -> g
     10:15:void shiftKeys(int):341:346 -> g
     10:15:int removeEntry(int):221 -> g
+    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet object2IntEntrySet():761:762 -> g
+    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> g
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
-    1:5:int removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:1:java.util.Set keySet():49:49 -> keySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():816:817 -> keySet
+    1:5:int removeNullEntry():227:231 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():816:817 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
     2:3:void ensureCapacity(int):209:210 -> putAll
     2:3:void putAll(java.util.Map):237 -> putAll
@@ -45206,15 +45689,14 @@
     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.u.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
-    1:1: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: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.u.a.a.a.h.S$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.T$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>
@@ -45222,21 +45704,20 @@
     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.u.a.a.a.h.S$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.T$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.u.a.a.a.h.S$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.T$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>
     1:1:void clear():810:810 -> clear
     1:1:boolean contains(java.lang.Object):798:798 -> contains
-    1:1:java.util.Iterator iterator():785:785 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.S$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.T$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>
@@ -45255,17 +45736,16 @@
     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.u.a.a.a.h.S$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.T$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>
     1:1:void clear():755:755 -> clear
     1:16:boolean contains(java.lang.Object):691:706 -> contains
-    1:1:java.util.Iterator iterator():679:679 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.S$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.T$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
@@ -45283,17 +45763,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.S$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.T$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> i
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.u.a.a.a.h.U:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.u.a.a.a.h.U$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.V:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.u.a.a.a.h.X:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.t.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.t.a.a.a.h.V$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.t.a.a.a.h.Y:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -45334,10 +45814,10 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet object2LongEntrySet():761:762 -> i
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:5:long removeNullEntry():227:231 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet object2LongEntrySet():761:762 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> j
+    1:5:long removeNullEntry():227:231 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():816:817 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -45352,15 +45832,14 @@
     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.u.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.X:
     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
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> c
     1:1:void clear():866:866 -> clear
-    1:1:java.util.Iterator iterator():848:848 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.X$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.Y$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>
@@ -45368,21 +45847,20 @@
     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.u.a.a.a.h.X$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.Y$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.u.a.a.a.h.X$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.Y$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>
     1:1:void clear():810:810 -> clear
     1:1:boolean contains(java.lang.Object):798:798 -> contains
-    1:1:java.util.Iterator iterator():785:785 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.X$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.Y$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>
@@ -45401,17 +45879,16 @@
     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.u.a.a.a.h.X$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.Y$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>
     1:1:void clear():755:755 -> clear
     1:16:boolean contains(java.lang.Object):691:706 -> contains
-    1:1:java.util.Iterator iterator():679:679 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.X$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.Y$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
@@ -45429,13 +45906,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.X$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.Y$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.u.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.t.a.a.a.h.a0:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -45474,14 +45951,14 @@
     13:19:java.lang.Object removeEntry(int):309 -> f
     1:3:java.lang.Object firstKey():927:927 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):701:711 -> get
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> h
     1:1:int realSize():291:291 -> hashCode
     1:1:int hashCode():1729 -> hashCode
     2:10:int hashCode():1730:1738 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap headMap(java.lang.Object):959:959 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
-    1:7:java.lang.Object removeNullEntry():315:321 -> i
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> i
     1:1:boolean isEmpty():766:766 -> isEmpty
+    1:7:java.lang.Object removeNullEntry():315:321 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1488:1489 -> keySet
     1:2:java.util.Set keySet():85 -> keySet
     1:3:java.lang.Object lastKey():938:938 -> lastKey
@@ -45505,15 +45982,14 @@
     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.u.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.t.a.a.a.h.Z:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
-    1:1: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: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.u.a.a.a.h.Z$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.a0$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>
@@ -45528,14 +46004,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.u.a.a.a.h.Z$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.a0$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.u.a.a.a.h.Z$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.a0$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>
@@ -45555,7 +46031,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.u.a.a.a.h.Z$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.a0$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>
@@ -45565,7 +46041,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.u.a.a.a.h.Z$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.a0$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>
@@ -45576,9 +46052,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1228:1228 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1245:1245 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1228 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1228:1228 -> iterator
-    2:2:java.util.Iterator iterator():1228:1228 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1230:1230 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1230:1230 -> iterator
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry last():1261:1261 -> last
     1:3:java.lang.Object last():1228 -> last
     1:28:boolean remove(java.lang.Object):1289:1316 -> remove
@@ -45589,7 +46063,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.u.a.a.a.h.Z$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.a0$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -45607,36 +46081,40 @@
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.Z$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.a0$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.u.a.a.a.h.b0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.u.a.a.a.h.a0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.c0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.u.a.a.a.h.e0:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> l
-    java.lang.Object[] value -> b
-    int size -> j
-    java.lang.Object[] key -> a
-    int n -> h
-    int maxFill -> i
-    int last -> f
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet entries -> k
-    int first -> e
-    long[] link -> g
-    int mask -> c
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> m
-    boolean containsNullKey -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.t.a.a.a.h.c0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.t.a.a.a.h.b0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.t.a.a.a.h.f0:
+    java.lang.Object[] key -> b
+    java.lang.Object[] value -> c
+    int maxFill -> j
+    int size -> k
+    int n -> i
+    int first -> f
+    int last -> g
+    int mask -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet entries -> l
+    long[] link -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> n
+    boolean containsNullKey -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> m
     1:1:void <init>(int,float):145:145 -> <init>
     2:56:void <init>(int,float):100:154 -> <init>
     57:57:void <init>(int,float):147:147 -> <init>
     58:58:void <init>(int,float):146:146 -> <init>
     1:1:java.lang.Object access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):85:85 -> a
     2:2:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):85:85 -> a
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet object2ReferenceEntrySet():1348:1349 -> a
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet():85 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet object2ReferenceEntrySet():1348:1349 -> a
+    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():85 -> a
     1:24:void fixPointers(int,int):863:886 -> c
     1:6:void clear():720:725 -> clear
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap clone():1670:1680 -> clone
@@ -45655,21 +46133,19 @@
     13:19:java.lang.Object removeEntry(int):278 -> f
     1:3:java.lang.Object firstKey():896:896 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):670:680 -> get
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet object2ReferenceEntrySet():1348:1349 -> h
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet():85 -> h
     1:1:int realSize():260:260 -> hashCode
     1:1:int hashCode():1697 -> hashCode
     2:10:int hashCode():1698:1706 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):928:928 -> headMap
-    1:1:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):928:928 -> headMap
+    2:2:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
     1:7:java.lang.Object removeNullEntry():284:290 -> i
     1:1:boolean isEmpty():735:735 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1457:1458 -> keySet
-    1:2:java.util.Set keySet():85 -> keySet
     1:3:java.lang.Object lastKey():907:907 -> lastKey
     1:25:int insert(java.lang.Object,java.lang.Object):307:331 -> put
     1:25:java.lang.Object put(java.lang.Object,java.lang.Object):338 -> put
-    26:27:java.lang.Object put(java.lang.Object,java.lang.Object):340:341 -> put
+    26:28:java.lang.Object put(java.lang.Object,java.lang.Object):339:341 -> put
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void ensureCapacity(int):264:265 -> putAll
     2:3:void putAll(java.util.Map):296 -> putAll
@@ -45682,20 +46158,20 @@
     1:12:java.lang.Object remove(java.lang.Object):378:389 -> remove
     1:1:int size():730:730 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):938:938 -> subMap
-    1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):85 -> subMap
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):938:938 -> subMap
+    2:2:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):85 -> subMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):918:918 -> tailMap
-    1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
-    1:1:java.util.Collection values():85:85 -> values
-    2:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1498:1519 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.d0:
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):918:918 -> tailMap
+    2:2:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1498:1519 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.e0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
-    1:1:java.util.Iterator iterator():1498:1498 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.e0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.f0$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -45710,14 +46186,14 @@
     1:1:void set(java.lang.Object):1147:1147 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1139:1139 -> set
     2:2:void set(java.lang.Object):1147 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.e0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.f0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.e0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.f0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -45737,7 +46213,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1391 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(java.lang.Object):1441:1441 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1391 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.e0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.f0$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -45747,7 +46223,7 @@
     1:1:int hashCode():808:808 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):793:794 -> setValue
     1:1:java.lang.String toString():813:813 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.e0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.f0$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -45758,9 +46234,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1197:1197 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1214:1214 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1197 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1197:1197 -> iterator
-    2:2:java.util.Iterator iterator():1197:1197 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1199:1199 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1199:1199 -> iterator
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry last():1230:1230 -> last
     1:3:java.lang.Object last():1197 -> last
     1:28:boolean remove(java.lang.Object):1258:1285 -> remove
@@ -45771,7 +46245,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1197:1197 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1219:1219 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1197 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.e0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.f0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -45789,17 +46263,386 @@
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.e0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.f0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.u.a.a.a.h.g0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.u.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.h0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.u.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.t.a.a.a.h.h0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet() -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.t.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.t.a.a.a.h.m0:
+    java.util.Comparator actualComparator -> k
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
+    boolean modified -> i
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry tree -> b
+    java.util.Comparator storedComparator -> j
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry[] nodePath -> m
+    int count -> c
+    boolean[] dirPath -> l
+    1:1:void <init>():81:81 -> <init>
+    2:10:void <init>():75:83 -> <init>
+    11:13:void <init>(java.util.Comparator):108:110 -> <init>
+    1:77:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():1116:1192 -> a
+    1:1:int compare(java.lang.Object,java.lang.Object):220:220 -> b
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):233:235 -> c
+    4:4:int compare(java.lang.Object,java.lang.Object):220:220 -> c
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):235 -> c
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry findKey(java.lang.Object):236:236 -> c
+    1:6:void clear():666:671 -> clear
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1850:1856 -> clone
+    1:7:java.lang.Object clone():43 -> clone
+    8:9:void allocatePaths():268:269 -> clone
+    8:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1857 -> clone
+    8:9:java.lang.Object clone():43 -> clone
+    10:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1858:1869 -> clone
+    10:21:java.lang.Object clone():43 -> clone
+    22:23:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> clone
+    22:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1870 -> clone
+    22:23:java.lang.Object clone():43 -> clone
+    24:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> clone
+    24:25:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1871 -> clone
+    24:25:java.lang.Object clone():43 -> clone
+    26:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1872:1895 -> clone
+    26:49:java.lang.Object clone():43 -> clone
+    50:51:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> clone
+    50:51:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1896 -> clone
+    50:51:java.lang.Object clone():43 -> clone
+    52:53:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> clone
+    52:53:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1897 -> clone
+    52:53:java.lang.Object clone():43 -> clone
+    54:54:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap clone():1852:1852 -> clone
+    54:54:java.lang.Object clone():43 -> clone
+    1:1:java.util.Comparator comparator():1337:1337 -> comparator
+    1:1:boolean containsKey(java.lang.Object):934:934 -> containsKey
+    1:3:boolean containsValue(java.lang.Object):654:656 -> containsValue
+    4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator.next():1278:1278 -> containsValue
+    4:4:boolean containsValue(java.lang.Object):658 -> containsValue
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):250:252 -> d
+    4:4:int compare(java.lang.Object,java.lang.Object):220:220 -> d
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):252 -> d
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):254:254 -> d
+    1:3:java.lang.Object firstKey():956:956 -> firstKey
+    1:2:java.lang.Object get(java.lang.Object):950:951 -> get
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1342:1342 -> headMap
+    1:2:void allocatePaths():268:269 -> i
+    1:1:boolean isEmpty():944:944 -> isEmpty
+    1:1:void setActualComparator():98:98 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1261:1262 -> keySet
+    1:3:java.lang.Object lastKey():962:962 -> lastKey
+    1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):296:306 -> put
+    1:11:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    12:12:int compare(java.lang.Object,java.lang.Object):220:220 -> put
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):306 -> put
+    12:12:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    13:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):310:320 -> put
+    13:23:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    24:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> put
+    24:25:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):321 -> put
+    24:25:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    26:33:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):324:331 -> put
+    26:33:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    34:35:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> put
+    34:35:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):332 -> put
+    34:35:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    36:56:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):338:358 -> put
+    36:56:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    57:58:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> put
+    57:58:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):359 -> put
+    57:58:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    59:70:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):362:373 -> put
+    59:70:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    71:72:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> put
+    71:72:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):374 -> put
+    71:72:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    73:89:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):379:395 -> put
+    73:89:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    90:91:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> put
+    90:91:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):396 -> put
+    90:91:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    92:103:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):399:410 -> put
+    92:103:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    104:105:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> put
+    104:105:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):411 -> put
+    104:105:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    106:109:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):418:421 -> put
+    106:109:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    110:111:java.lang.Object put(java.lang.Object,java.lang.Object):275:276 -> put
+    112:112:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry add(java.lang.Object):335:335 -> put
+    112:112:java.lang.Object put(java.lang.Object,java.lang.Object):274 -> put
+    1:8:java.lang.Object remove(java.lang.Object):436:443 -> remove
+    9:9:int compare(java.lang.Object,java.lang.Object):220:220 -> remove
+    9:9:java.lang.Object remove(java.lang.Object):443 -> remove
+    10:56:java.lang.Object remove(java.lang.Object):464:510 -> remove
+    57:58:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    57:58:java.lang.Object remove(java.lang.Object):510 -> remove
+    59:116:java.lang.Object remove(java.lang.Object):511:568 -> remove
+    117:118:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    117:118:java.lang.Object remove(java.lang.Object):568 -> remove
+    119:131:java.lang.Object remove(java.lang.Object):571:583 -> remove
+    132:133:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> remove
+    132:133:java.lang.Object remove(java.lang.Object):583 -> remove
+    134:194:java.lang.Object remove(java.lang.Object):557:617 -> remove
+    195:196:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> remove
+    195:196:java.lang.Object remove(java.lang.Object):617 -> remove
+    197:209:java.lang.Object remove(java.lang.Object):620:632 -> remove
+    210:211:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry.pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> remove
+    210:211:java.lang.Object remove(java.lang.Object):632 -> remove
+    212:255:java.lang.Object remove(java.lang.Object):606:649 -> remove
+    256:272:java.lang.Object remove(java.lang.Object):444:460 -> remove
+    1:1:int size():939:939 -> size
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1352:1352 -> subMap
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1347:1347 -> tailMap
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1311:1332 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.t.a.a.a.h.j0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
+    java.util.Comparator comparator -> a
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
+    1:1:void clear():1164:1164 -> clear
+    1:1:java.util.Comparator comparator():1125:1125 -> comparator
+    1:4:boolean contains(java.lang.Object):1141:1144 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry first():1169:1169 -> first
+    1:1:java.lang.Object first():1116 -> first
+    1:1:java.util.SortedSet headSet(java.lang.Object):1116:1116 -> headSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1184:1184 -> headSet
+    2:2:java.util.SortedSet headSet(java.lang.Object):1116 -> headSet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1130:1130 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry last():1174:1174 -> last
+    1:1:java.lang.Object last():1116 -> last
+    1:4:boolean remove(java.lang.Object):1150:1153 -> remove
+    1:1:int size():1159:1159 -> size
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1116:1116 -> subSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet subSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1179:1179 -> subSet
+    2:2:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1116 -> subSet
+    1:1:java.util.SortedSet tailSet(java.lang.Object):1116:1116 -> tailSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1189:1189 -> tailSet
+    2:2:java.util.SortedSet tailSet(java.lang.Object):1116 -> tailSet
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.t.a.a.a.h.i0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1117:1117 -> <init>
+    1:1:int compare(java.lang.Object,java.lang.Object):1117:1117 -> compare
+    2:2:int compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1119:1119 -> compare
+    2:2:int compare(java.lang.Object,java.lang.Object):1117 -> compare
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.t.a.a.a.h.k0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1311:1311 -> <init>
+    1:1:void clear():1329:1329 -> clear
+    1:1:boolean contains(java.lang.Object):1319:1319 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1314:1314 -> iterator
+    1:1:int size():1324:1324 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.t.a.a.a.h.l0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> c
+    int info -> e
+    1:1:void <init>():707:707 -> <init>
+    2:3:void <init>(java.lang.Object,java.lang.Object):719:720 -> <init>
+    1:2:void left(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):813:814 -> a
+    3:4:void black(boolean):845:846 -> a
+    1:2:void pred(boolean):768:769 -> b
+    3:4:void pred(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):791:792 -> b
+    5:5:boolean black():834:834 -> b
+    1:2:void succ(boolean):780:781 -> c
+    3:4:void right(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):824:825 -> c
+    5:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry clone():886:892 -> c
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry clone():888:888 -> c
+    1:1:java.lang.Object clone():685:685 -> clone
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left():729:729 -> d
+    2:3:void succ(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry):802:803 -> d
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next():855:857 -> e
+    1:3:boolean equals(java.lang.Object):899:901 -> equals
+    1:1:boolean pred():748:748 -> f
+    1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev():868:870 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right():739:739 -> h
+    1:1:int hashCode():906:906 -> hashCode
+    1:1:boolean succ():757:757 -> i
+    1:2:java.lang.Object setValue(java.lang.Object):876:877 -> setValue
+    1:1:java.lang.String toString():911:911 -> toString
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.m0$a:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1086:1086 -> <init>
+    1:1:void add(java.lang.Object):1085:1085 -> add
+    2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1110:1110 -> add
+    2:2:void add(java.lang.Object):1085 -> add
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry next():1095:1095 -> next
+    1:1:java.lang.Object next():1085 -> next
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry previous():1100:1100 -> previous
+    1:1:java.lang.Object previous():1085 -> previous
+    1:1:void set(java.lang.Object):1085:1085 -> set
+    2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1105:1105 -> set
+    2:2:void set(java.lang.Object):1085 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.m0$b:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1206:1206 -> <init>
+    1:1:void add(java.lang.Object):1230:1230 -> add
+    1:1:java.lang.Object next():1215:1215 -> next
+    1:1:java.lang.Object previous():1220:1220 -> previous
+    1:1:void set(java.lang.Object):1225:1225 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.t.a.a.a.h.m0$c:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1237:1237 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1237:1237 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1239:1239 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.t.a.a.a.h.m0$d:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> i
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
+    java.lang.Object from -> b
+    boolean top -> e
+    java.lang.Object to -> c
+    boolean bottom -> d
+    1:7:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,java.lang.Object,boolean,java.lang.Object,boolean):1397:1403 -> <init>
+    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet():1428:1506 -> a
+    1:1:boolean in(java.lang.Object):1423:1423 -> c
+    2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> c
+    2:2:boolean in(java.lang.Object):1423 -> c
+    3:3:boolean in(java.lang.Object):1423:1423 -> c
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> c
+    4:4:boolean in(java.lang.Object):1423 -> c
+    1:4:void clear():1408:1411 -> clear
+    1:1:java.util.Comparator comparator():1607:1607 -> comparator
+    1:1:boolean containsKey(java.lang.Object):1550:1550 -> containsKey
+    2:2:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.containsKey(java.lang.Object):934:934 -> containsKey
+    2:2:boolean containsKey(java.lang.Object):1550 -> containsKey
+    1:4:boolean containsValue(java.lang.Object):1555:1558 -> containsValue
+    1:3:java.lang.Object firstKey():1679:1681 -> firstKey
+    4:4:java.lang.Object firstKey():1680:1680 -> firstKey
+    1:1:java.lang.Object get(java.lang.Object):1569:1569 -> get
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1612:1613 -> headMap
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> headMap
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1613 -> headMap
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1613:1613 -> headMap
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry():1638:1650 -> i
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1703 -> isEmpty
+    1:1:boolean isEmpty():1602 -> isEmpty
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):998:998 -> isEmpty
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703 -> isEmpty
+    2:2:boolean isEmpty():1602 -> isEmpty
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1704:1704 -> isEmpty
+    3:3:boolean isEmpty():1602 -> isEmpty
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry():1661:1673 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1521:1522 -> keySet
+    1:3:java.lang.Object lastKey():1686:1688 -> lastKey
+    4:4:java.lang.Object lastKey():1687:1687 -> lastKey
+    1:4:java.lang.Object put(java.lang.Object,java.lang.Object):1574:1577 -> put
+    1:4:java.lang.Object remove(java.lang.Object):1583:1586 -> remove
+    1:5:int size():1591:1595 -> size
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1624:1625 -> subMap
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> subMap
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1625 -> subMap
+    4:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1625:1626 -> subMap
+    6:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> subMap
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1626 -> subMap
+    7:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1626:1628 -> subMap
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1618:1619 -> tailMap
+    3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> tailMap
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619 -> tailMap
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619:1619 -> tailMap
+    1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1527:1544 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.t.a.a.a.h.n0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1428:1428 -> <init>
+    1:1:void clear():1478:1478 -> clear
+    1:1:java.util.Comparator comparator():1441:1441 -> comparator
+    1:4:boolean contains(java.lang.Object):1447:1450 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry first():1483:1483 -> first
+    1:1:java.lang.Object first():1428 -> first
+    1:1:java.util.SortedSet headSet(java.lang.Object):1428:1428 -> headSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1498:1498 -> headSet
+    2:2:java.util.SortedSet headSet(java.lang.Object):1428 -> headSet
+    1:1:boolean isEmpty():1473:1473 -> isEmpty
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1703 -> isEmpty
+    2:2:boolean isEmpty():1473 -> isEmpty
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):998:998 -> isEmpty
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703 -> isEmpty
+    3:3:boolean isEmpty():1473 -> isEmpty
+    4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1704:1704 -> isEmpty
+    4:4:boolean isEmpty():1473 -> isEmpty
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1431:1431 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry last():1488:1488 -> last
+    1:1:java.lang.Object last():1428 -> last
+    1:4:boolean remove(java.lang.Object):1456:1459 -> remove
+    1:1:int size():1466:1466 -> size
+    1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1428:1428 -> subSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet subSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1493:1493 -> subSet
+    2:2:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1428 -> subSet
+    1:1:java.util.SortedSet tailSet(java.lang.Object):1428:1428 -> tailSet
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1503:1503 -> tailSet
+    2:2:java.util.SortedSet tailSet(java.lang.Object):1428 -> tailSet
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.t.a.a.a.h.o0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1527:1527 -> <init>
+    1:1:void clear():1541:1541 -> clear
+    1:1:boolean contains(java.lang.Object):1533:1533 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1529:1529 -> iterator
+    1:1:int size():1537:1537 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.t.a.a.a.h.m0$d$a:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> b
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1509:1509 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1509:1509 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1511:1511 -> iterator
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.t.a.a.a.h.m0$d$b:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1734:1734 -> <init>
+    1:1:void add(java.lang.Object):1733:1733 -> add
+    2:2:void add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1758:1758 -> add
+    2:2:void add(java.lang.Object):1733 -> add
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry next():1743:1743 -> next
+    1:1:java.lang.Object next():1733 -> next
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry previous():1748:1748 -> previous
+    1:1:java.lang.Object previous():1733 -> previous
+    1:1:void set(java.lang.Object):1733:1733 -> set
+    2:2:void set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1753:1753 -> set
+    2:2:void set(java.lang.Object):1733 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.t.a.a.a.h.m0$d$c:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> f
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1704 -> <init>
+    1:2:void updateNext():1728:1729 -> m
+    1:2:void updatePrevious():1723:1724 -> n
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.t.a.a.a.h.m0$d$d:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1774:1774 -> <init>
+    1:1:void add(java.lang.Object):1798:1798 -> add
+    1:1:java.lang.Object next():1783:1783 -> next
+    1:1:java.lang.Object previous():1788:1788 -> previous
+    1:1:void set(java.lang.Object):1793:1793 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.t.a.a.a.h.m0$d$e:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1812:1812 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1812:1812 -> <init>
+    1:1:void add(java.lang.Object):1830:1830 -> add
+    1:1:java.lang.Object next():1815:1815 -> next
+    1:1:java.lang.Object previous():1820:1820 -> previous
+    1:1:void set(java.lang.Object):1825:1825 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.t.a.a.a.h.m0$e:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next -> b
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> a
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry curr -> c
+    int index -> d
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):997:997 -> <init>
+    2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):995:998 -> <init>
+    1:1:boolean hasNext():1011:1011 -> hasNext
+    1:1:boolean hasPrevious():1015:1015 -> hasPrevious
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry nextEntry():1023:1023 -> k
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry previousEntry():1035:1035 -> l
+    1:1:void updateNext():1019:1019 -> m
+    1:1:void updatePrevious():1031:1031 -> n
+    1:1:int nextIndex():1043:1043 -> nextIndex
+    1:1:int previousIndex():1047:1047 -> previousIndex
+    1:12:void remove():1051:1051 -> remove
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.m0$f:
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1275:1275 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1275:1275 -> <init>
+    1:1:void add(java.lang.Object):1293:1293 -> add
+    1:1:java.lang.Object next():1278:1278 -> next
+    1:1:java.lang.Object previous():1283:1283 -> previous
+    1:1:void set(java.lang.Object):1288:1288 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap -> com.android.tools.r8.t.a.a.a.h.q0:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet() -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.t.a.a.a.h.s0:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -45822,7 +46665,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.u.a.a.a.h.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.t.a.a.a.h.r0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -45837,7 +46680,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.u.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.t.a.a.a.h.u0:
     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
@@ -45857,19 +46700,19 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.u.a.a.a.h.k0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.t.a.a.a.h.t0:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.u.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.t.a.a.a.h.v0:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.u.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.u.a.a.a.h.o0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.u.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.t.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.t.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.t.a.a.a.h.y0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -45878,37 +46721,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.u.a.a.a.h.q0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.u.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.t.a.a.a.h.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.t.a.a.a.h.C0:
     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.u.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.t.a.a.a.h.A0:
     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.u.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.t.a.a.a.h.B0:
     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.u.a.a.a.h.u0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.t.a.a.a.h.D0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.u.a.a.a.h.v0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.u.a.a.a.h.w0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.u.a.a.a.h.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.t.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.t.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.t.a.a.a.h.H0:
     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.u.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.t.a.a.a.h.G0:
     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.u.a.a.a.h.z0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.u.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.t.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.t.a.a.a.h.K0:
     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.u.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.t.a.a.a.h.J0:
     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
@@ -45919,10 +46762,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.u.a.a.a.h.E0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.u.a.a.a.h.C0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.D0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.u.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.t.a.a.a.h.N0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.t.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.t.a.a.a.h.P0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
@@ -45964,8 +46807,8 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():980 -> hashCode
     2:10:int hashCode():981:989 -> hashCode
-    1:5:boolean removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():389:389 -> isEmpty
+    1:5:boolean removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():771:772 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -45980,15 +46823,14 @@
     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.u.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.O0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     1:1:void clear():821:821 -> clear
-    1:1: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: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.u.a.a.a.h.G0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.P0$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>
@@ -45996,21 +46838,20 @@
     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.u.a.a.a.h.G0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.P0$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.u.a.a.a.h.G0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.P0$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>
     1:1:void clear():765:765 -> clear
     1:1:boolean contains(java.lang.Object):753:753 -> contains
-    1:1:java.util.Iterator iterator():740:740 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.G0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.P0$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>
@@ -46028,17 +46869,16 @@
     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.u.a.a.a.h.G0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.P0$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>
     1:1:void clear():710:710 -> clear
     1:16:boolean contains(java.lang.Object):646:661 -> contains
-    1:1:java.util.Iterator iterator():634:634 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.G0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.P0$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
@@ -46056,13 +46896,13 @@
     14:23:void remove():589 -> remove
     24:25:void remove():592:593 -> remove
     26:26:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.G0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.P0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> f
     1:1:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.u.a.a.a.h.J0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.t.a.a.a.h.S0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -46082,17 +46922,16 @@
     7:7:java.lang.Object clone():37 -> clone
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():231:231 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> d
-    3:4:boolean containsValue(int):270:271 -> d
+    2:3:boolean containsValue(int):270:271 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():231:231 -> e
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
     1:1:boolean isEmpty():277:277 -> isEmpty
-    1:1:java.util.Set keySet():37:37 -> keySet
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
     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.u.a.a.a.h.H0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.u.a.a.a.h.J0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.t.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.t.a.a.a.h.S0$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>
@@ -46102,7 +46941,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.u.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.t.a.a.a.h.R0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -46111,11 +46950,11 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.u.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.t.a.a.a.h.T0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
     int removeInt(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.u.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.t.a.a.a.h.V0:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -46148,8 +46987,8 @@
     12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap clone():1770:1770 -> clone
     12:12:java.lang.Object clone():87 -> clone
     1:10:boolean containsKey(java.lang.Object):738:747 -> containsKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> d
-    2:6:boolean containsValue(int):754:758 -> d
+    1:5:boolean containsValue(int):754:758 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> e
     1:25:void fixPointers(int):899:923 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
     1:42:void rehash(int):1709:1750 -> g
@@ -46164,12 +47003,12 @@
     2:10:int hashCode():1796:1804 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> i
     1:1:boolean isEmpty():785:785 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> j
-    1:6:int removeNullEntry():285:290 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> k
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():87:87 -> keySet
     2:2:java.util.Set keySet():87:87 -> keySet
+    1:6:int removeNullEntry():285:290 -> l
     1:3:java.lang.Object lastKey():981:981 -> lastKey
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void ensureCapacity(int):266:267 -> putAll
@@ -46187,15 +47026,14 @@
     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.u.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.U0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
-    1:1: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: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.u.a.a.a.h.M0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.V0$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>
@@ -46210,14 +47048,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.u.a.a.a.h.M0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.V0$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.u.a.a.a.h.M0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.V0$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>
@@ -46237,7 +47075,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.u.a.a.a.h.M0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.V0$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>
@@ -46256,7 +47094,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.u.a.a.a.h.M0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.V0$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>
@@ -46267,9 +47105,7 @@
     1:1:java.util.SortedSet headSet(java.lang.Object):1269:1269 -> headSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet headSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1286:1286 -> headSet
     2:2:java.util.SortedSet headSet(java.lang.Object):1269 -> headSet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1269:1269 -> iterator
-    2:2:java.util.Iterator iterator():1269:1269 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1271:1271 -> iterator
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry last():1302:1302 -> last
     1:3:java.lang.Object last():1269 -> last
     1:29:boolean remove(java.lang.Object):1331:1359 -> remove
@@ -46280,7 +47116,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.u.a.a.a.h.M0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.V0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -46298,7 +47134,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.M0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.V0$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
@@ -46313,11 +47149,11 @@
     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.u.a.a.a.h.N0:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.u.a.a.a.h.N0$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.O0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.u.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.t.a.a.a.h.W0:
+    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.W0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.X0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.t.a.a.a.h.Z0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -46347,8 +47183,8 @@
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
     1:5:boolean containsValue(int):404:408 -> d
-    6:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():761:762 -> d
-    6:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> d
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet reference2IntEntrySet():761:762 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
     1:7:void rehash(int):961:967 -> f
     8:8:int realSize():205:205 -> f
     8:8:void rehash(int):968 -> f
@@ -46362,10 +47198,9 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
-    1:5:int removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:1:java.util.Set keySet():49:49 -> keySet
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():816:817 -> keySet
+    1:5:int removeNullEntry():227:231 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():816:817 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
     2:3:void ensureCapacity(int):209:210 -> putAll
     2:3:void putAll(java.util.Map):237 -> putAll
@@ -46378,15 +47213,14 @@
     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.u.a.a.a.h.P0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.Y0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
-    1:1: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: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.u.a.a.a.h.Q0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.Z0$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>
@@ -46394,21 +47228,20 @@
     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.u.a.a.a.h.Q0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.Z0$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.u.a.a.a.h.Q0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.Z0$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>
     1:1:void clear():810:810 -> clear
     1:1:boolean contains(java.lang.Object):798:798 -> contains
-    1:1:java.util.Iterator iterator():785:785 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.Q0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.Z0$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>
@@ -46427,17 +47260,16 @@
     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.u.a.a.a.h.Q0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.Z0$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>
     1:1:void clear():755:755 -> clear
     1:16:boolean contains(java.lang.Object):691:706 -> contains
-    1:1:java.util.Iterator iterator():679:679 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.Q0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.Z0$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
@@ -46455,17 +47287,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.Q0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.Z0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> i
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.u.a.a.a.h.R0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.u.a.a.a.h.U0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.u.a.a.a.h.S0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.u.a.a.a.h.T0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.u.a.a.a.h.W0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.t.a.a.a.h.a1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.t.a.a.a.h.d1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.t.a.a.a.h.b1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.t.a.a.a.h.c1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.t.a.a.a.h.f1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> h
@@ -46506,8 +47338,8 @@
     1:1:int realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
-    1:5:long removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
+    1:5:long removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():816:817 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -46522,15 +47354,14 @@
     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.Reference2LongOpenHashMap$1 -> com.android.tools.r8.u.a.a.a.h.V0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.t.a.a.a.h.e1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:boolean contains(long):861:861 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> c
     1:1:void clear():866:866 -> clear
-    1:1:java.util.Iterator iterator():848:848 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.u.a.a.a.h.W0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.t.a.a.a.h.f1$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -46538,21 +47369,20 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$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.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.u.a.a.a.h.W0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.t.a.a.a.h.f1$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.u.a.a.a.h.W0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.t.a.a.a.h.f1$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
     1:1:void clear():810:810 -> clear
     1:1:boolean contains(java.lang.Object):798:798 -> contains
-    1:1:java.util.Iterator iterator():785:785 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.u.a.a.a.h.W0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.t.a.a.a.h.f1$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -46570,17 +47400,16 @@
     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.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.u.a.a.a.h.W0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.t.a.a.a.h.f1$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
     1:1:void clear():755:755 -> clear
     1:16:boolean contains(java.lang.Object):691:706 -> contains
-    1:1:java.util.Iterator iterator():679:679 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.u.a.a.a.h.W0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.t.a.a.a.h.f1$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -46598,13 +47427,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.u.a.a.a.h.W0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.t.a.a.a.h.f1$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.u.a.a.a.h.Y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.t.a.a.a.h.h1:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -46627,7 +47456,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.u.a.a.a.h.X0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.t.a.a.a.h.g1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -46642,7 +47471,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.u.a.a.a.h.a1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.t.a.a.a.h.j1:
     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
@@ -46662,17 +47491,17 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.u.a.a.a.h.Z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.t.a.a.a.h.i1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.u.a.a.a.h.b1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.u.a.a.a.h.e1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.t.a.a.a.h.k1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.t.a.a.a.h.n1:
     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.u.a.a.a.h.c1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.t.a.a.a.h.l1:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -46680,7 +47509,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.u.a.a.a.h.d1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.t.a.a.a.h.m1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -46702,9 +47531,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.u.a.a.a.h.f1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.t.a.a.a.h.o1:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.u.a.a.a.h.h1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.t.a.a.a.h.q1:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -46745,15 +47574,14 @@
     1:1:int hashCode():662 -> hashCode
     2:4:int hashCode():663:665 -> hashCode
     1:1:boolean isEmpty():385:385 -> isEmpty
-    1:1:java.util.Iterator iterator():40:40 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():515:515 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():515:515 -> iterator
     1:1:boolean remove(java.lang.Object):332:332 -> remove
     2:5:boolean removeNullEntry():321:324 -> remove
     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.u.a.a.a.h.g1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.u.a.a.a.h.h1$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.t.a.a.a.h.p1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.t.a.a.a.h.q1$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
@@ -46771,17 +47599,17 @@
     14:22:void remove():500 -> remove
     23:24:void remove():503:504 -> remove
     25:25:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.u.a.a.a.h.i1:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.u.a.a.a.h.k1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.t.a.a.a.h.r1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.t.a.a.a.h.t1:
     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.u.a.a.a.h.j1:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.t.a.a.a.h.s1:
     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.u.a.a.a.h.l1:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.v.b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.t.a.a.a.h.u1:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.u.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
@@ -46790,86 +47618,95 @@
     com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.dex.Marker marker -> f
-    1:1:void <clinit>():58:58 -> <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):82:90 -> <init>
+    1:1:void <clinit>():63:63 -> <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):87:95 -> <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):352 -> a
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):351:351 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):380 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):379:379 -> 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):354 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):353:360 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):358:358 -> a
-    13:17:void write(com.android.tools.r8.ClassFileConsumer):94:98 -> a
-    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):123:123 -> 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.util.Optional):123 -> a
-    20:24:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):124:128 -> a
-    25:31:java.lang.String getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):244:250 -> a
-    25:31:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):128 -> a
-    32:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):129:129 -> a
-    33:38:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):208:213 -> a
-    33:38:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):130 -> a
-    39:53:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):131:145 -> a
-    54:64:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):254:264 -> a
-    54:64:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):145 -> a
-    65:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):147:189 -> a
-    108:112:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):39:43 -> a
-    108:112:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):189 -> a
-    113:113:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):190:190 -> a
-    114:117:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):194:197 -> a
-    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> a
-    118:118:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):198 -> a
-    119:119:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):198:198 -> a
-    120:127:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):197:204 -> a
-    128:135:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):219:226 -> a
-    136:146:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):230:240 -> a
-    147:150:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):289:292 -> a
-    151:154:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):282:285 -> a
-    151:154:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):293 -> a
-    155:157:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):294:296 -> a
-    158:162: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):304:308 -> a
-    163:171:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):268:276 -> a
-    163:171: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):308 -> a
-    172:180: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):309:317 -> a
-    181:194:void writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):327:340 -> a
-    181:194: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):317 -> a
-    195:197: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:320 -> a
-    198:198:void writeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int):456:456 -> a
-    198:198: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):321 -> a
-    199:199: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:323 -> a
-    200:200:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):359:359 -> a
-    201:210:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):369:378 -> a
-    211:216:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):377:382 -> a
-    217:218:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):388:389 -> a
-    219:275:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):394:450 -> a
-    276:279:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):444:444 -> a
-    280:280:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):440:440 -> a
-    281:281:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):437:437 -> a
-    282:282:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):434:434 -> a
-    283:283:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):431:431 -> a
-    284:284:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):428:428 -> a
-    285:287:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):422:424 -> a
-    288:288:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):423:423 -> a
-    289:295:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):410:416 -> a
-    296:299:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):397:400 -> a
-    300:304:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):399:403 -> a
-    1:7:void writeApplication(com.android.tools.r8.ClassFileConsumer):103:109 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():366:366 -> b
-    8:8:void writeApplication(com.android.tools.r8.ClassFileConsumer):110 -> b
-    9:13:void writeApplication(com.android.tools.r8.ClassFileConsumer):110:114 -> b
-    14:19:void writeApplication(com.android.tools.r8.ClassFileConsumer):112:117 -> b
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.v.a:
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):382 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):381:388 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):386:386 -> a
+    13:18:void write(com.android.tools.r8.ClassFileConsumer):99:104 -> a
+    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):151:151 -> a
+    20:20:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):209:209 -> a
+    20:20:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):151 -> a
+    21:25:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):152:156 -> a
+    26:32:java.lang.String getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):272:278 -> a
+    26:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):156 -> a
+    33:33:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):157:157 -> a
+    34:39:int getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):236:241 -> a
+    34:39:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):158 -> a
+    40:54:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):159:173 -> a
+    55:65:com.android.tools.r8.com.google.common.collect.ImmutableMap getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):282:292 -> a
+    55:65:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):173 -> a
+    66:108:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):175:217 -> a
+    109:113:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
+    109:113:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.util.Optional):217 -> a
+    114:114:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):218:218 -> a
+    115:118:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):222:225 -> a
+    119:119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> a
+    119:119:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):226 -> a
+    120:120:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):226:226 -> a
+    121:128:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):225:232 -> a
+    129:136:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):247:254 -> a
+    137:147:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotationSet):258:268 -> a
+    148:151:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):317:320 -> a
+    152:155:java.lang.Object getStaticValue(com.android.tools.r8.graph.DexEncodedField):310:313 -> a
+    152:155:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):321 -> a
+    156:157:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):322:323 -> a
+    158:162: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):332:336 -> a
+    163:171:java.lang.String[] getExceptions(com.android.tools.r8.graph.DexAnnotationSet):296:304 -> a
+    163:171: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):336 -> a
+    172:180: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):337:345 -> a
+    181:194:void writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):355:368 -> a
+    181:194: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):345 -> a
+    195:197: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):346:348 -> a
+    198:198:void writeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,int):484:484 -> a
+    198:198: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):349 -> a
+    199:199:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$1(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):387:387 -> a
+    200:209:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):397:406 -> a
+    210:215:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):405:410 -> a
+    216:217:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):416:417 -> a
+    218:274:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):422:478 -> a
+    275:278:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):472:472 -> a
+    279:279:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):468:468 -> a
+    280:280:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):465:465 -> a
+    281:281:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):462:462 -> a
+    282:282:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):459:459 -> a
+    283:283:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):456:456 -> a
+    284:286:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):450:452 -> a
+    287:287:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):451:451 -> a
+    288:294:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):438:444 -> a
+    295:298:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):425:428 -> a
+    299:303:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):427:431 -> a
+    1:7:void writeApplication(com.android.tools.r8.ClassFileConsumer):108:114 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():361:361 -> b
+    8:8:void writeApplication(com.android.tools.r8.ClassFileConsumer):115 -> b
+    9:36:void writeApplication(com.android.tools.r8.ClassFileConsumer):115:142 -> b
+    37:49:void writeApplication(com.android.tools.r8.ClassFileConsumer):118:130 -> b
+    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> b
+    50:50:void writeApplication(com.android.tools.r8.ClassFileConsumer):134 -> b
+    51:53:void writeApplication(com.android.tools.r8.ClassFileConsumer):136:138 -> b
+    54:58:void writeApplication(com.android.tools.r8.ClassFileConsumer):135:139 -> b
+    59:59:void writeApplication(com.android.tools.r8.ClassFileConsumer):132:132 -> b
+    60:61:void writeApplication(com.android.tools.r8.ClassFileConsumer):120:121 -> b
+    62:62:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> b
+    62:62:void writeApplication(com.android.tools.r8.ClassFileConsumer):125 -> b
+    63:64:void writeApplication(com.android.tools.r8.ClassFileConsumer):126:127 -> b
+    65:87:void writeApplication(com.android.tools.r8.ClassFileConsumer):123:145 -> b
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.u.a:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.w.a.a:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.v.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.w.a.b:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.v.a.b:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.w.a.c:
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.w.a.d:
+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:
     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
@@ -46884,16 +47721,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.w.a.e:
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.w.a.f:
+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.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.w.a.g:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.v.a.g:
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.w.a.h:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.v.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>
@@ -46902,7 +47739,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.w.a.i:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.v.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
@@ -46912,7 +47749,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.w.a.j:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.v.a.j:
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
     java.lang.Object lock -> c
@@ -46922,19 +47759,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.w.a.k:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.v.a.k:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.w.a.l:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.v.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.w.a.m:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.v.a.m:
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.w.a.n:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.v.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.w.a.o:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.v.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>
@@ -46943,10 +47780,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.w.a.p:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.v.a.p:
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.w.a.q.b:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractCollection -> com.android.tools.r8.v.a.q.b:
     1:1:void <init>():13:13 -> <init>
     int getSize() -> c
     1:2:boolean contains(java.lang.Object):40:41 -> contains
@@ -46959,11 +47796,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.w.a.q.a:
+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 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.w.a.q.d:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList -> com.android.tools.r8.v.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
@@ -46979,10 +47816,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.w.a.q.c:
+com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$Companion -> com.android.tools.r8.v.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.w.a.q.d$a:
+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 this$0 -> b
     int index -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.collections.AbstractList):70:70 -> <init>
@@ -46992,7 +47829,7 @@
     2:2:boolean hasNext():74 -> hasNext
     1:1:int getIndex():72:72 -> k
     1:3:java.lang.Object next():77:77 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.AbstractList$ListIteratorImpl -> com.android.tools.r8.w.a.q.d$b:
+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 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>
@@ -47001,7 +47838,7 @@
     1:1:int nextIndex():94:94 -> nextIndex
     1: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.w.a.q.e:
+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 list -> c
     int fromIndex -> d
     int _size -> b
@@ -47014,7 +47851,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.w.a.q.f:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.v.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
@@ -47095,8 +47932,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.w.a.q.g:
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.w.a.q.h:
+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:
     int[] $this_asList -> b
     1:1:void <init>(int[]):162:162 -> <init>
     1:1:boolean contains(int):165:165 -> b
@@ -47141,12 +47978,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.w.a.q.i:
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.w.a.q.j:
+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:
     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.w.a.q.k:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.v.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>
@@ -47154,7 +47991,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.w.a.q.l:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.v.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>
@@ -47176,7 +48013,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.w.a.q.m:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.v.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>
@@ -47187,7 +48024,7 @@
     1:1:boolean equals(java.lang.Object):16:16 -> equals
     1:1:java.util.Set keySet():13:13 -> keySet
     1:1:java.util.Collection values():13:13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.w.a.q.n:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.v.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>
@@ -47197,17 +48034,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.w.a.q.o:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.v.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.w.a.q.p:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.v.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.w.a.q.q:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.v.a.q.q:
     java.util.Iterator iterator -> b
     int index -> a
     1:1:void <init>(java.util.Iterator):37:37 -> <init>
@@ -47218,27 +48055,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.w.a.r.a:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.v.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.w.a.s.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.v.a.s.a:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.w.a.s.b.a:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.v.a.s.b.a:
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.w.a.s.b.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.v.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.w.a.s.b.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.v.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.w.a.s.c.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 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.w.a.s.c.b:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.v.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
@@ -47248,7 +48085,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.w.a.s.c.c:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.v.a.s.c.c:
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
     1:77:java.lang.Object[] toArray(java.util.Collection,java.lang.Object[]):30:106 -> a
@@ -47259,8 +48096,8 @@
     253:256:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
     257:340:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     341:341:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.w.a.s.c.d:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.w.a.s.c.e:
+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:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -47273,10 +48110,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.w.a.s.c.f:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.v.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.w.a.s.c.h:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.v.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
@@ -47304,7 +48141,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.w.a.s.c.g:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.v.a.s.c.g:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -47355,7 +48192,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.w.a.s.c.i:
+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.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
@@ -47370,9 +48207,9 @@
     34:34:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):0:0 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.w.a.s.c.j:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.v.a.s.c.j:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.w.a.t.b:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.v.a.t.b:
     com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion Companion -> d
     int last -> b
     int step -> c
@@ -47389,10 +48226,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.w.a.t.a:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.v.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.w.a.t.c:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.v.a.t.c:
     int step -> d
     boolean hasNext -> b
     int next -> c
@@ -47417,7 +48254,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.w.a.t.e:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.v.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>
@@ -47427,34 +48264,34 @@
     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.w.a.t.d:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.v.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.w.a.t.f:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.v.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.w.a.t.g:
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.w.a.u.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:
     java.lang.Object call(java.lang.Object[]) -> a
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.w.a.u.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.w.a.u.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.w.a.u.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.w.a.u.c:
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.w.a.v.a:
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.w.a.v.c:
+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.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.w.a.v.b:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.v.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.w.a.w.b:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.v.a.w.b:
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
     int startIndex -> b
@@ -47465,7 +48302,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.w.a.w.a:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.v.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
@@ -47492,7 +48329,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.w.a.w.c:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.v.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
@@ -47572,11 +48409,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.w.a.w.d:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.w.a.w.e:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.w.a.w.f:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.w.a.w.g:
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.w.a.w.h:
+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:
     char[] $delimiters -> a
     boolean $ignoreCase -> b
     1:1145:com.android.tools.r8.jetbrains.kotlin.Pair invoke(java.lang.CharSequence,int):0:1144 -> a
@@ -47584,7 +48421,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.w.a.w.i:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.v.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
@@ -47605,8 +48442,8 @@
     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.w.a.w.j:
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.w.b.a.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.a:
     int bitWidth -> b
     int value -> c
     int offset -> a
@@ -47616,28 +48453,28 @@
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.w.b.a.a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.v.b.a.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.w.b.a.a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.v.b.a.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.Flag$ValueParameter -> com.android.tools.r8.w.b.a.a$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.v.b.a.a$c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():455:467 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.w.b.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.v.b.a.b:
     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.w.b.a.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.v.b.a.c:
     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.w.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.v.b.a.u:
     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.w.b.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.v.b.a.d:
     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
@@ -47650,7 +48487,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.w.b.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.v.b.a.e:
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
@@ -47663,7 +48500,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.w.b.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.v.b.a.f:
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
     1:1:java.lang.Boolean getValue():38:38 -> a
@@ -47679,7 +48516,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.w.b.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.v.b.a.g:
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
     1:1:java.lang.Byte getValue():31:31 -> a
@@ -47695,7 +48532,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.w.b.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.v.b.a.h:
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
     1:1:java.lang.Character getValue():32:32 -> a
@@ -47711,7 +48548,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.w.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.v.b.a.i:
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
     1:1:java.lang.Double getValue():37:37 -> a
@@ -47727,13 +48564,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.w.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.v.b.a.j:
     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.w.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.v.b.a.k:
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
     1:1:java.lang.Float getValue():36:36 -> a
@@ -47749,7 +48586,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.w.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.v.b.a.l:
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
     1:1:java.lang.Integer getValue():34:34 -> a
@@ -47765,7 +48602,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.w.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.v.b.a.m:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     1:1:java.lang.String getValue():46:46 -> a
@@ -47778,7 +48615,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.w.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.v.b.a.n:
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
     1:1:java.lang.Long getValue():35:35 -> a
@@ -47794,7 +48631,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.w.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.v.b.a.o:
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
     1:1:java.lang.Short getValue():33:33 -> a
@@ -47810,7 +48647,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.w.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.v.b.a.p:
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
     1:1:java.lang.String getValue():45:45 -> a
@@ -47823,7 +48660,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.w.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.v.b.a.q:
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
     1:1:java.lang.Byte getValue():40:40 -> a
@@ -47839,7 +48676,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.w.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.v.b.a.r:
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
     1:1:java.lang.Integer getValue():42:42 -> a
@@ -47855,7 +48692,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.w.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.v.b.a.s:
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
     1:1:java.lang.Long getValue():43:43 -> a
@@ -47871,7 +48708,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.w.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.v.b.a.t:
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
     1:1:java.lang.Short getValue():41:41 -> a
@@ -47887,7 +48724,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.w.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.v.b.a.v:
     java.util.List extensions -> o
     java.lang.String companionObject -> j
     int flags -> b
@@ -47964,8 +48801,8 @@
     1:1:java.util.List getSealedSubclasses():94:94 -> m
     1:1:java.util.List getSupertypes():54:54 -> n
     1:1:java.util.List getTypeParameters():49:49 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.w.b.a.w:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.w.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.v.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.v.b.a.x:
     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
@@ -47981,26 +48818,26 @@
     1:1:void visitEnd():153 -> e
     2:2:void visitEnd():153:153 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.w.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.v.b.a.y:
     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.w.b.a.y$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.v.b.a.y$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.w.b.a.y$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.v.b.a.y$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.w.b.a.y$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.v.b.a.y$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.w.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.v.b.a.z:
     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.w.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.v.b.a.A:
     java.util.List valueParameters -> b
     java.util.List extensions -> d
     java.util.List versionRequirements -> c
@@ -48018,8 +48855,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():266:266 -> b
     1:1:int getFlags():248:248 -> c
     1:1:java.util.List getValueParameters():252:252 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.w.b.a.B:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.w.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.v.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.v.b.a.C:
     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>
@@ -48027,30 +48864,30 @@
     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.w.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.v.b.a.D:
     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:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:773 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):774:774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.w.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.v.b.a.E:
     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.KmDeclarationContainer -> com.android.tools.r8.w.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.v.b.a.F:
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.w.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.v.b.a.G:
     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
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.w.b.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.v.b.a.H:
     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
@@ -48062,7 +48899,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.w.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.v.b.a.I:
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue constantValue -> d
@@ -48078,7 +48915,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.w.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.v.b.a.J:
     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>
@@ -48088,26 +48925,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.w.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.v.b.a.K:
     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.w.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.v.b.a.L:
     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.w.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.v.b.a.M:
     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.w.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.v.b.a.N:
     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
@@ -48120,15 +48957,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.w.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.v.b.a.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.w.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.v.b.a.P:
     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.w.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.v.b.a.Q:
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType receiverParameterType -> c
@@ -48162,8 +48999,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getReturnType():312:312 -> g
     1:1:java.util.List getTypeParameters():297:297 -> h
     1:1:java.util.List getValueParameters():307:307 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.w.b.a.S:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.w.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.v.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.v.b.a.T:
     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>
@@ -48175,17 +49012,17 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):284:284 -> b
     2:2:void visitEnd():310:310 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():290:290 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.w.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.v.b.a.U:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():223:223 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):230:230 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.w.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.v.b.a.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):187:187 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):187:187 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
     2:2:void visitEnd():201:201 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.w.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.v.b.a.W:
     java.util.List functions -> b
     java.util.List extensions -> e
     java.util.List typeAliases -> d
@@ -48224,15 +49061,15 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     1:1:java.util.List getFunctions():179:179 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.w.b.a.X:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.w.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.v.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.v.b.a.Y:
     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 -> e
     1:1:void visitEnd():178 -> e
     2:2:void visitEnd():178:178 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.w.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.v.b.a.Z:
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
     java.lang.String name -> i
@@ -48267,8 +49104,8 @@
     1:1:int getSetterFlags():379:379 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():394:394 -> i
     1:1:java.util.List getTypeParameters():384:384 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.w.b.a.a0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.w.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.v.b.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.v.b.a.b0:
     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>
@@ -48279,7 +49116,7 @@
     5:5:void visitEnd():376:376 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):356:356 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():362:362 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.w.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.v.b.a.c0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
     java.util.List arguments -> c
@@ -48314,8 +49151,9 @@
     2:2:void visitTypeParameter(int):647:647 -> c
     1:1:java.util.List getArguments():603:603 -> d
     1:1:int getFlags():594:594 -> e
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():626:626 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.w.b.a.d0:
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():633:633 -> f
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():626:626 -> g
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.v.b.a.d0:
     java.util.List typeParameters -> b
     java.lang.String name -> h
     java.util.List versionRequirements -> f
@@ -48339,7 +49177,7 @@
     1:1:int getFlags():450:450 -> d
     1:1:java.lang.String getName():451:451 -> e
     1:1:java.util.List getTypeParameters():456:456 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.w.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.v.b.a.e0:
     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>
@@ -48349,8 +49187,8 @@
     4:4:void visitEnd():435:435 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):405:405 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.w.b.a.f0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.w.b.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.v.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.v.b.a.g0:
     java.util.List upperBounds -> b
     java.util.List extensions -> c
     int id -> f
@@ -48371,15 +49209,15 @@
     1:1:java.lang.String getName():559:559 -> d
     1:1:java.util.List getUpperBounds():566:566 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.w.b.a.h0:
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.w.b.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.v.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.v.b.a.i0:
     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
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):482:482 -> a
     2:2:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.w.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.v.b.a.j0:
     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
@@ -48389,7 +49227,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():929:929 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():929:929 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.w.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.v.b.a.k0:
     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>
@@ -48403,7 +49241,7 @@
     2:2:void visitStarProjection():555:555 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
     1:1:void visitTypeParameter(int):537:537 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.w.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.v.b.a.l0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
     int flags -> d
@@ -48416,19 +49254,19 @@
     1:1:java.lang.String getName():518:518 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():528:528 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.w.b.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.v.b.a.m0:
     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>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):452:452 -> a
     2:2:void visitEnd():466:466 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):460:460 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.w.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.v.b.a.n0:
     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.w.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.v.b.a.o0:
     int minor -> b
     int patch -> c
     int major -> a
@@ -48437,7 +49275,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.w.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.v.b.a.p0:
     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
@@ -48449,26 +49287,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.w.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.v.b.a.q0:
     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.w.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.v.b.a.r0:
     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.w.b.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.v.b.a.s0:
     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.w.b.a.t0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.v.b.a.t0.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
@@ -48505,55 +49343,55 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():444 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.w.b.a.t0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.v.b.a.t0.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.w.b.a.t0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.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.LambdaWriter -> com.android.tools.r8.w.b.a.t0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.v.b.a.t0.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):483:485 -> <init>
     1:1:void setT(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):484:484 -> a
@@ -48563,13 +49401,13 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):488 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():485:485 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():484:484 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.w.b.a.t0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.v.b.a.t0.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):483:483 -> a
     2:490:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:488 -> a
     2:490:java.lang.Object invoke(java.lang.Object):483 -> a
     491:491:java.lang.Object invoke(java.lang.Object):483:483 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.w.b.a.t0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.v.b.a.t0.p:
     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
@@ -48585,31 +49423,31 @@
     1:2:void visitEnd():477:478 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.w.b.a.t0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.l:
     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.w.b.a.t0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.v.b.a.t0.n:
     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.w.b.a.t0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.v.b.a.t0.o:
     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.w.b.a.t0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.v.b.a.t0.q:
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> d
@@ -48625,7 +49463,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.w.b.a.t0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.v.b.a.t0.r:
     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
@@ -48927,7 +49765,7 @@
     4838:4838:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
     4839:4839:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):432:432 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.w.b.a.t0.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.v.b.a.t0.s:
     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>
@@ -48935,7 +49773,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.w.b.a.t0.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.v.b.a.t0.w:
     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
@@ -48952,25 +49790,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.w.b.a.t0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.t:
     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.w.b.a.t0.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.v.b.a.t0.u:
     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.w.b.a.t0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.v:
     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.w.b.a.t0.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.v.b.a.t0.y:
     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
@@ -48981,13 +49819,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.w.b.a.t0.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.v.b.a.t0.x:
     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.w.b.a.t0.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.v.b.a.t0.B:
     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
@@ -49008,19 +49846,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.w.b.a.t0.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.v.b.a.t0.z:
     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.w.b.a.t0.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.v.b.a.t0.A:
     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.w.b.a.t0.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.v.b.a.t0.F:
     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
@@ -49041,25 +49879,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.w.b.a.t0.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.v.b.a.t0.D:
     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.w.b.a.t0.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.v.b.a.t0.E:
     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.w.b.a.t0.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.v.b.a.t0.N:
     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
@@ -49093,7 +49931,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.w.b.a.t0.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.v.b.a.t0.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:166:void invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):0:164 -> a
@@ -49111,43 +49949,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.w.b.a.t0.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.H:
     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.w.b.a.t0.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.v.b.a.t0.L:
     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.w.b.a.t0.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.M:
     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.w.b.a.t0.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.v.b.a.t0.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
     int $setterFlags -> g
@@ -49179,43 +50017,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.w.b.a.t0.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.O:
     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.w.b.a.t0.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.v.b.a.t0.T:
     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.w.b.a.t0.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.U:
     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.w.b.a.t0.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.v.b.a.t0.b0:
     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
@@ -49244,13 +50082,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.w.b.a.t0.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.v.b.a.t0.W:
     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.w.b.a.t0.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.v.b.a.t0.X:
     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
@@ -49259,26 +50097,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.w.b.a.t0.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.Y:
     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.w.b.a.t0.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.v.b.a.t0.Z:
     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.w.b.a.t0.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.v.b.a.t0.a0:
     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.w.b.a.t0.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.v.b.a.t0.g0:
     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
@@ -49304,31 +50142,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.w.b.a.t0.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.v.b.a.t0.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: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.w.b.a.t0.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.v.b.a.t0.e0:
     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.w.b.a.t0.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.f0:
     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.w.b.a.t0.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.v.b.a.t0.j0:
     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
@@ -49344,19 +50182,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.w.b.a.t0.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.v.b.a.t0.h0:
     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.w.b.a.t0.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.v.b.a.t0.i0:
     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.w.b.a.t0.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.v.b.a.t0.m0:
     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
@@ -49373,19 +50211,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.w.b.a.t0.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.v.b.a.t0.k0:
     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.w.b.a.t0.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.v.b.a.t0.l0:
     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.w.b.a.t0.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.v.b.a.t0.p0:
     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
@@ -49408,7 +50246,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.w.b.a.t0.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.v.b.a.t0.n0:
     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
@@ -49416,7 +50254,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.w.b.a.t0.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.v.b.a.t0.o0:
     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
@@ -49424,29 +50262,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.w.b.a.t0.q0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.w.b.a.t0.q0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.w.b.a.t0.q0.c:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.w.b.a.t0.q0.d:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.w.b.a.t0.q0.e:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.w.b.a.t0.q0.f:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.w.b.a.t0.q0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.w.b.a.t0.q0.h:
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.w.b.a.t0.q0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.v.b.a.t0.q0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.v.b.a.t0.q0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.v.b.a.t0.q0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.v.b.a.t0.q0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.v.b.a.t0.q0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.v.b.a.t0.q0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.v.b.a.t0.q0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.v.b.a.t0.q0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.v.b.a.t0.q0.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.w.b.a.t0.q0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.v.b.a.t0.q0.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.w.b.a.t0.q0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.v.b.a.t0.q0.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.w.b.a.u0.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.w.b.a.u0.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.v.b.a.u0.a.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.v.b.a.u0.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
@@ -49505,11 +50343,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4327:4327 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.w.b.a.u0.a.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.v.b.a.u0.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
@@ -49561,11 +50399,11 @@
     1:1:boolean hasValue():3813:3813 -> k
     1:2:void initFields():3823:3824 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939:3939 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.w.b.a.u0.a.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.v.b.a.u0.a.d:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -49608,7 +50446,7 @@
     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
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.w.b.a.u0.a.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.v.b.a.u0.a.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> p
     int memoizedSerializedSize -> o
     int arrayDimensionCount_ -> l
@@ -49724,11 +50562,11 @@
     1:1:boolean hasFlags():2793:2793 -> x
     1:1:boolean hasFloatValue():2617:2617 -> y
     1:1:boolean hasIntValue():2602:2602 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.w.b.a.u0.a.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.v.b.a.u0.a.f:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -49799,7 +50637,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value build():3060:3060 -> g
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> h
     1:3:void ensureArrayElementIsMutable():3530:3532 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.w.b.a.u0.a.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.v.b.a.u0.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
@@ -49832,7 +50670,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.w.b.a.u0.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.v.b.a.u0.a.j:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -49870,7 +50708,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation build():4371:4371 -> g
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> h
     1:3:void ensureArgumentIsMutable():4481:4483 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.w.b.a.u0.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.v.b.a.u0.a.o:
     java.util.List sealedSubclassFqName_ -> r
     int nestedClassNameMemoizedSerializedSize -> l
     java.util.List typeAlias_ -> p
@@ -50057,11 +50895,11 @@
     1:1:java.util.List getTypeParameterList():8977:8977 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> y
     1:1:java.util.List getVersionRequirementList():9311:9311 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.w.b.a.u0.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.v.b.a.u0.a.m:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -50179,7 +51017,7 @@
     1:3:void ensureTypeAliasIsMutable():10952:10954 -> p
     1:3:void ensureTypeParameterIsMutable():10195:10197 -> q
     1:3:void ensureVersionRequirementIsMutable():11327:11329 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.w.b.a.u0.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.v.b.a.u0.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
@@ -50194,7 +51032,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.w.b.a.u0.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.v.b.a.u0.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
@@ -50256,11 +51094,11 @@
     1:1:boolean hasFlags():13501:13501 -> o
     1:3:void initFields():13586:13588 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13718:13718 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.w.b.a.u0.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.v.b.a.u0.a.q:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -50297,7 +51135,7 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> h
     1:3:void ensureValueParameterIsMutable():13916:13918 -> i
     1:3:void ensureVersionRequirementIsMutable():14040:14042 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.w.b.a.u0.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.v.b.a.u0.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
@@ -50346,11 +51184,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.w.b.a.u0.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.v.b.a.u0.a.t:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -50385,7 +51223,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> g
     1:3:void ensureEffectIsMutable():23651:23653 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.w.b.a.u0.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.v.b.a.u0.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
@@ -50449,11 +51287,11 @@
     1:1:boolean hasKind():24216:24216 -> n
     1:4:void initFields():24226:24229 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24358:24358 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.w.b.a.u0.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -50498,7 +51336,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> g
     1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.w.b.a.u0.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.v.b.a.u0.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
@@ -50511,7 +51349,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.w.b.a.u0.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.v.b.a.u0.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
@@ -50524,7 +51362,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.w.b.a.u0.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.v.b.a.u0.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
@@ -50567,11 +51405,11 @@
     1:1:boolean hasName():20550:20550 -> m
     1:1:void initFields():20560:20560 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20665:20665 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.w.b.a.u0.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.v.b.a.u0.a.B:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -50602,7 +51440,7 @@
     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
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.w.b.a.u0.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.v.b.a.u0.a.G:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int memoizedSerializedSize -> k
     int isInstanceTypeId_ -> g
@@ -50689,11 +51527,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.w.b.a.u0.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -50751,7 +51589,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> h
     1:3:void ensureAndArgumentIsMutable():26005:26007 -> i
     1:3:void ensureOrArgumentIsMutable():26202:26204 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.w.b.a.u0.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.v.b.a.u0.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
@@ -50764,7 +51602,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.w.b.a.u0.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.v.b.a.u0.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
@@ -50891,11 +51729,11 @@
     1:1:boolean hasContract():14776:14776 -> x
     1:1:boolean hasFlags():14538:14538 -> y
     1:1:boolean hasName():14582:14582 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.w.b.a.u0.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.v.b.a.u0.a.I:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -51005,7 +51843,7 @@
     1:3:void ensureTypeParameterIsMutable():15533:15535 -> j
     1:3:void ensureValueParameterIsMutable():15750:15752 -> k
     1:3:void ensureVersionRequirementIsMutable():15934:15936 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.w.b.a.u0.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.v.b.a.u0.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
@@ -51017,7 +51855,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.w.b.a.u0.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.v.b.a.u0.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
@@ -51029,7 +51867,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.w.b.a.u0.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.v.b.a.u0.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
@@ -51110,11 +51948,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> r
     1:5:void initFields():11835:11839 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():11996:11996 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.w.b.a.u0.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -51174,7 +52012,7 @@
     1:3:void ensureFunctionIsMutable():12182:12184 -> j
     1:3:void ensurePropertyIsMutable():12307:12309 -> k
     1:3:void ensureTypeAliasIsMutable():12432:12434 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.w.b.a.u0.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.v.b.a.u0.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
@@ -51291,11 +52129,11 @@
     1:1:boolean hasFlags():16503:16503 -> x
     1:1:boolean hasGetterFlags():16686:16686 -> y
     1:1:boolean hasName():16549:16549 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.w.b.a.u0.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.v.b.a.u0.a.Q:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -51399,7 +52237,7 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> i
     1:3:void ensureTypeParameterIsMutable():17480:17482 -> j
     1:3:void ensureVersionRequirementIsMutable():17868:17870 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.w.b.a.u0.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.v.b.a.u0.a.Z:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -51530,11 +52368,11 @@
     1:1:int getTypeParameter():5807:5807 -> x
     1:1:int getTypeParameterName():5830:5830 -> y
     1:1:boolean hasAbbreviatedType():5902:5902 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.w.b.a.u0.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.v.b.a.u0.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
@@ -51588,11 +52426,11 @@
     1:1:boolean hasTypeId():5257:5257 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.w.b.a.u0.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -51636,7 +52474,7 @@
     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
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.w.b.a.u0.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.v.b.a.u0.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
@@ -51651,7 +52489,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.w.b.a.u0.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.v.b.a.u0.a.Y:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -51771,7 +52609,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6253:6253 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> i
     1:3:void ensureArgumentIsMutable():6434:6436 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.w.b.a.u0.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.v.b.a.u0.a.c0:
     int memoizedSerializedSize -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
@@ -51875,11 +52713,11 @@
     1:1:boolean hasName():19218:19218 -> x
     1:1:boolean hasUnderlyingType():19268:19268 -> y
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.w.b.a.u0.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -51958,7 +52796,7 @@
     1:3:void ensureAnnotationIsMutable():20213:20215 -> j
     1:3:void ensureTypeParameterIsMutable():19904:19906 -> k
     1:3:void ensureVersionRequirementIsMutable():20337:20339 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.w.b.a.u0.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.v.b.a.u0.a.g0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     int upperBoundIdMemoizedSerializedSize -> j
@@ -52043,11 +52881,11 @@
     1:1:boolean hasVariance():7510:7510 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.w.b.a.u0.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.v.b.a.u0.a.e0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -52095,7 +52933,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7805:7805 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> i
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.w.b.a.u0.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.v.b.a.u0.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
@@ -52108,7 +52946,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.w.b.a.u0.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.v.b.a.u0.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
@@ -52163,11 +53001,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.w.b.a.u0.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.v.b.a.u0.a.i0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -52199,7 +53037,7 @@
     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
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.w.b.a.u0.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.v.b.a.u0.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
@@ -52279,11 +53117,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.w.b.a.u0.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -52353,7 +53191,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495 -> h
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495:18495 -> h
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.w.b.a.u0.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.v.b.a.u0.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
@@ -52417,11 +53255,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> s
     1:6:void initFields():21326:21331 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21462:21462 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.w.b.a.u0.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.v.b.a.u0.a.o0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -52475,7 +53313,7 @@
     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
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.w.b.a.u0.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.v.b.a.u0.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
@@ -52488,7 +53326,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.w.b.a.u0.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.v.b.a.u0.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
@@ -52501,7 +53339,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.w.b.a.u0.a.u0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.v.b.a.u0.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
@@ -52546,11 +53384,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.w.b.a.u0.a.s0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.v.b.a.u0.a.t0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -52585,7 +53423,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> g
     1:3:void ensureRequirementIsMutable():22271:22273 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.w.b.a.u0.a.v0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.v.b.a.u0.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
@@ -52599,7 +53437,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.w.b.a.u0.a.w0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.v.b.a.u0.a.w0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -52616,7 +53454,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.w.b.a.u0.a.w0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.v.b.a.u0.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
@@ -52653,8 +53491,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.w.b.a.u0.a.w0.b:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.w.b.a.u0.a.w0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.v.b.a.u0.a.w0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.v.b.a.u0.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
@@ -52662,7 +53500,7 @@
     1:1:java.lang.Boolean get(int):265:265 -> b
     2:2:void $$$reportNull$$$0(int):0:0 -> b
     2:2:java.lang.Boolean get(int):265 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.w.b.a.u0.a.w0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.v.b.a.u0.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
@@ -52673,7 +53511,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.w.b.a.u0.a.w0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.v.b.a.u0.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>
@@ -52683,15 +53521,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.w.b.a.u0.a.w0.g:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.w.b.a.u0.a.w0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.v.b.a.u0.a.w0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.w0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.v.b.a.u0.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
@@ -52705,10 +53543,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.w.b.a.u0.a.w0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.w0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.v.b.a.u0.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
@@ -52723,10 +53561,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.w.b.a.u0.a.w0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.w0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.v.b.a.u0.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
@@ -52746,14 +53584,14 @@
     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.w.b.a.u0.a.w0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.v.b.a.u0.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
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.w.b.a.u0.a.x0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.v.b.a.u0.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
@@ -52768,8 +53606,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.w.b.a.u0.a.x0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.w.b.a.u0.a.x0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.v.b.a.u0.a.x0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.v.b.a.u0.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
@@ -52820,11 +53658,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.w.b.a.u0.a.x0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.v.b.a.u0.a.x0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -52858,7 +53696,7 @@
     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
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.w.b.a.u0.a.x0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.v.b.a.u0.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
@@ -52909,11 +53747,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.w.b.a.u0.a.x0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.v.b.a.u0.a.x0.f:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -52947,7 +53785,7 @@
     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
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.w.b.a.u0.a.x0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.v.b.a.u0.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
@@ -53003,11 +53841,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> o
     1:4:void initFields():3276:3279 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3396:3396 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.w.b.a.u0.a.x0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -53087,7 +53925,7 @@
     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
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.w.b.a.u0.a.x0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.v.b.a.u0.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
@@ -53139,11 +53977,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> i
     1:2:void initFields():1633:1634 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1751:1751 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.w.b.a.u0.a.x0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.v.b.a.u0.a.x0.l:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -53173,7 +54011,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> g
     1:3:void ensureLocalNameIsMutable():1996:1998 -> h
     1:3:void ensureRecordIsMutable():1872:1874 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.w.b.a.u0.a.x0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.v.b.a.u0.a.x0.p:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     int replaceCharMemoizedSerializedSize -> j
@@ -53277,11 +54115,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940:940 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.w.b.a.u0.a.x0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.v.b.a.u0.a.x0.n:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -53334,7 +54172,7 @@
     1:1:int getSubstringIndexCount():1372:1372 -> j
     1:1:boolean hasOperation():1300:1300 -> k
     1:1:boolean hasPredefinedIndex():1152:1152 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.w.b.a.u0.a.x0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.v.b.a.u0.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
@@ -53347,7 +54185,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.w.b.a.u0.a.x0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.v.b.a.u0.a.x0.s.a:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -53376,7 +54214,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.w.b.a.u0.a.x0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.v.b.a.u0.a.x0.s.c:
     java.util.Map map -> a
     1:10:void <clinit>():20:29 -> <clinit>
     11:11:void <clinit>():21:21 -> <clinit>
@@ -53400,20 +54238,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.w.b.a.u0.a.x0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.s.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.v.b.a.u0.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>
@@ -53438,7 +54276,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.w.b.a.u0.a.x0.s.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.v.b.a.u0.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>
@@ -53463,7 +54301,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.w.b.a.u0.a.x0.s.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.v.b.a.u0.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>
@@ -53474,7 +54312,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.w.b.a.u0.a.x0.s.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.v.b.a.u0.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
@@ -53494,10 +54332,10 @@
     2:2:boolean isLocalClassName(int):75:75 -> b
     1:1:java.lang.String[] getStrings():15:15 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.w.b.a.u0.a.x0.s.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.x0.s.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.v.b.a.u0.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>
@@ -53547,7 +54385,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.w.b.a.u0.a.x0.t.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.v.b.a.u0.a.x0.t.a:
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
     java.util.ArrayList strings -> a
@@ -53593,7 +54431,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.w.b.a.u0.a.y0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.v.b.a.u0.a.y0.b:
     java.util.HashMap interned -> b
     int firstIndex -> a
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner):8:10 -> <init>
@@ -53611,13 +54449,13 @@
     5992:5995:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.w.b.a.u0.a.y0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.a.y0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.v.b.a.u0.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>
@@ -53645,7 +54483,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.w.b.a.u0.a.y0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.v.b.a.u0.a.y0.d:
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
     int hashCode -> b
@@ -53653,14 +54491,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.w.b.a.u0.b.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.b.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder -> com.android.tools.r8.v.b.a.u0.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
@@ -53668,14 +54506,14 @@
     2:4:void addAll(java.lang.Iterable,java.util.Collection):335 -> a
     5:11:void addAll(java.lang.Iterable,java.util.Collection):336:342 -> 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.w.b.a.u0.b.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder$LimitedInputStream -> com.android.tools.r8.v.b.a.u0.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.w.b.a.u0.b.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractParser -> com.android.tools.r8.v.b.a.u0.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
@@ -53729,7 +54567,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.ByteString -> com.android.tools.r8.w.b.a.u0.b.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.v.b.a.u0.b.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> a
     boolean $assertionsDisabled -> b
     1:22:void <clinit>():60:81 -> <clinit>
@@ -53756,9 +54594,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output newOutput():751:751 -> f
     int peekCachedHashCode() -> g
     1:1:java.lang.String toString():1019:1019 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.w.b.a.u0.b.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.v.b.a.u0.b.e:
     byte nextByte() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.w.b.a.u0.b.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.v.b.a.u0.b.f:
     int bufferPos -> e
     byte[] buffer -> d
     java.util.ArrayList flushedBuffers -> b
@@ -53783,7 +54621,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.w.b.a.u0.b.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.v.b.a.u0.b.h:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -53891,7 +54729,7 @@
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.w.b.a.u0.b.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.v.b.a.u0.b.j:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -53988,9 +54826,9 @@
     1:6:void writeRawByte(int):1042 -> f
     1:4:void writeRawLittleEndian32(int):1246:1249 -> g
     1:4:void writeRawVarint32(int):1195:1198 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.w.b.a.u0.b.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.v.b.a.u0.b.i:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.w.b.a.u0.b.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.v.b.a.u0.b.l:
     java.util.Map extensionsByNumber -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -54008,13 +54846,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.w.b.a.u0.b.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.v.b.a.u0.b.k:
     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.w.b.a.u0.b.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.v.b.a.u0.b.n:
     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
@@ -54267,8 +55105,8 @@
     1:5:java.util.Iterator iterator():197:201 -> e
     1:5:void makeImmutable():107:111 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.w.b.a.u0.b.m:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.w.b.a.u0.b.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.v.b.a.u0.b.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.v.b.a.u0.b.u:
     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
@@ -54360,15 +55198,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.w.b.a.u0.b.o:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.w.b.a.u0.b.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.v.b.a.u0.b.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.v.b.a.u0.b.p:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.w.b.a.u0.b.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.v.b.a.u0.b.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -54401,7 +55239,7 @@
     19:19:void verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> b
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.w.b.a.u0.b.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.v.b.a.u0.b.r:
     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>
@@ -54437,7 +55275,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.w.b.a.u0.b.r$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.v.b.a.u0.b.r$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
@@ -54474,7 +55312,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.w.b.a.u0.b.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.v.b.a.u0.b.s:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -54485,7 +55323,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.w.b.a.u0.b.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.v.b.a.u0.b.t:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -54507,14 +55345,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.w.b.a.u0.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.v.b.a.u0.b.x:
     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.w.b.a.u0.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.v.b.a.u0.b.v:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.w.b.a.u0.b.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.v.b.a.u0.b.w:
     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.w.b.a.u0.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.v.b.a.u0.b.y:
     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>
@@ -54523,14 +55361,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.w.b.a.u0.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.v.b.a.u0.b.z:
     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.w.b.a.u0.b.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.v.b.a.u0.b.C:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -54562,8 +55400,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> i
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.w.b.a.u0.b.A:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.w.b.a.u0.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.v.b.a.u0.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.v.b.a.u0.b.B:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -54574,12 +55412,12 @@
     1:1:java.lang.Byte next():325:325 -> next
     1:1:java.lang.Object next():310 -> next
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.w.b.a.u0.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.v.b.a.u0.b.D:
     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.w.b.a.u0.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.v.b.a.u0.b.E:
     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.w.b.a.u0.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.v.b.a.u0.b.J:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -54629,8 +55467,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.w.b.a.u0.b.F:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.w.b.a.u0.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.v.b.a.u0.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.v.b.a.u0.b.G:
     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>
@@ -54652,7 +55490,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.w.b.a.u0.b.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.v.b.a.u0.b.H:
     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>
@@ -54673,7 +55511,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> k
     1:1:java.lang.Object next():716:716 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.w.b.a.u0.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.v.b.a.u0.b.I:
     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
@@ -54684,7 +55522,7 @@
     1:1:java.lang.Byte next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.w.b.a.u0.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.v.b.a.u0.b.O:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -54711,38 +55549,38 @@
     10:11:java.lang.Object removeArrayEntryAt(int):303:304 -> e
     1:4:java.util.Set entrySet():353:356 -> entrySet
     1:6:java.lang.Object get(java.lang.Object):227:232 -> get
-    1:2:void checkMutable():364:365 -> h
-    1:1:int getNumArrayEntries():180:180 -> i
-    1:1:java.lang.Iterable getOverflowEntries():195:195 -> j
-    1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> k
-    1:1:boolean isImmutable():175:175 -> l
-    1:9:void makeImmutable():161:169 -> m
+    1:2:void checkMutable():364:365 -> i
+    1:1:int getNumArrayEntries():180:180 -> j
+    1:1:java.lang.Iterable getOverflowEntries():195:195 -> k
+    1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> l
+    1:1:boolean isImmutable():175:175 -> m
+    1:9:void makeImmutable():161:169 -> n
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.w.b.a.u0.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.v.b.a.u0.b.K:
     1:1:void <init>(int):100:100 -> <init>
-    1:5:void makeImmutable():104:108 -> m
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
-    6:6:void makeImmutable():108 -> m
-    7:13:void makeImmutable():109:115 -> m
-    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
-    14:14:void makeImmutable():115 -> m
-    15:20:void makeImmutable():116:121 -> m
+    1:5:void makeImmutable():104:108 -> n
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
+    6:6:void makeImmutable():108 -> n
+    7:13:void makeImmutable():109:115 -> n
+    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
+    14:14:void makeImmutable():115 -> n
+    15:20:void makeImmutable():116:121 -> n
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.w.b.a.u0.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.v.b.a.u0.b.N:
     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.w.b.a.u0.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.v.b.a.u0.b.L:
     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.w.b.a.u0.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.v.b.a.u0.b.M:
     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.w.b.a.u0.b.O$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.v.b.a.u0.b.O$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -54766,7 +55604,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.w.b.a.u0.b.O$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.v.b.a.u0.b.O$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -54779,7 +55617,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.w.b.a.u0.b.O$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.v.b.a.u0.b.O$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>
@@ -54791,9 +55629,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.w.b.a.u0.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.v.b.a.u0.b.P:
     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.w.b.a.u0.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.v.b.a.u0.b.Q:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -54802,10 +55640,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.w.b.a.u0.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.v.b.a.u0.b.Z:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.w.b.a.u0.b.S:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.w.b.a.u0.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.v.b.a.u0.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.v.b.a.u0.b.X:
     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
@@ -54834,19 +55672,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.w.b.a.u0.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.v.b.a.u0.b.T:
     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.w.b.a.u0.b.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.v.b.a.u0.b.U:
     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.w.b.a.u0.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.v.b.a.u0.b.V:
     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.w.b.a.u0.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.v.b.a.u0.b.W:
     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.w.b.a.u0.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.v.b.a.u0.b.Y:
     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
@@ -54861,7 +55699,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.w.b.a.v0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.v.b.a.v0.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>
@@ -54871,20 +55709,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.w.b.a.v0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.v.b.a.v0.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.w.b.a.v0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.v.b.a.v0.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.JvmExtensionsKt -> com.android.tools.r8.w.b.a.v0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.v.b.a.v0.d:
     1:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:31 -> a
     1:32:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167 -> a
     33:33:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167:167 -> a
@@ -54900,7 +55738,7 @@
     33:33:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):158:158 -> b
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.w.b.a.v0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.v.b.a.v0.e:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):51:51 -> <init>
@@ -54916,7 +55754,7 @@
     1:1:java.lang.String getDesc():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.w.b.a.v0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.v.b.a.v0.f:
     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>
@@ -54926,14 +55764,14 @@
     2:2:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):129:129 -> a
     3:3:void visitLambdaClassOriginName(java.lang.String):137:137 -> a
     1:1:void visitEnd():144:144 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.w.b.a.v0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.v.b.a.v0.g:
     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.w.b.a.v0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.v.b.a.v0.h:
     java.lang.String name -> a
     java.lang.String desc -> b
     1:1:void <init>(java.lang.String,java.lang.String):40:40 -> <init>
@@ -54949,7 +55787,7 @@
     1:1:java.lang.String getDesc():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.w.b.a.v0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.v.b.a.v0.i:
     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>
@@ -54958,7 +55796,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.w.b.a.v0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.v.b.a.v0.j:
     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>
@@ -54971,7 +55809,7 @@
     4:4:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):201:201 -> a
     5:5:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212:212 -> a
     1:1:void visitEnd():219:219 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.w.b.a.v0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.v.b.a.v0.k:
     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>
@@ -54981,7 +55819,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):324:324 -> a
     1:1:void visitEnd():331:331 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.w.b.a.v0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.v.b.a.v0.l:
     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>
@@ -54990,7 +55828,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279:279 -> a
     1:1:void visitEnd():286:286 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.w.b.a.v0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.v.b.a.v0.m:
     java.lang.String packageName -> g
     java.lang.String extraString -> f
     int[] COMPATIBLE_METADATA_VERSION -> i
@@ -55011,29 +55849,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.w.b.a.v0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.v.b.a.v0.n:
     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:342:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
-    1:342:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    343:356:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):339:352 -> a
-    343:356:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    357:357:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):351:351 -> a
-    357:357:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    358:358:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):350:350 -> a
-    358:358:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    359:359:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):349:349 -> a
-    359:359:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    360:360:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
-    360:360:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    361:371:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):347:357 -> a
-    361:371:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    372:372:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):355:355 -> a
-    372:372:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    373:373: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.w.b.a.v0.n$a:
+    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.v0.n$a:
     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>
@@ -55045,7 +55867,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.w.b.a.v0.n$a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.v.b.a.v0.n$a$a:
     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 -> i
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
@@ -55071,7 +55893,7 @@
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write(int[],int[],int):72 -> i
     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 -> i
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.w.b.a.v0.n$a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.v.b.a.v0.n$a$b:
     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
@@ -55082,10 +55904,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.w.b.a.v0.n$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.v.b.a.v0.n$b:
     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.w.b.a.v0.n$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.v.b.a.v0.n$c:
     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>
@@ -55097,7 +55919,7 @@
     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$Writer -> com.android.tools.r8.w.b.a.v0.n$c$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.v.b.a.v0.n$c$a:
     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 -> h
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
@@ -55107,7 +55929,7 @@
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write(int[],int[],int):128:131 -> h
     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 -> h
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.w.b.a.v0.n$c$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.v.b.a.v0.n$c$b:
     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
@@ -55118,11 +55940,11 @@
     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.w.b.a.v0.n$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.v.b.a.v0.n$d:
     java.util.List partClassNames -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
     1:1:java.util.List getPartClassNames():221:221 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.w.b.a.v0.n$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.v.b.a.v0.n$e:
     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>
@@ -55134,7 +55956,7 @@
     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$Writer -> com.android.tools.r8.w.b.a.v0.n$e$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.v.b.a.v0.n$e$a:
     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
@@ -55144,7 +55966,7 @@
     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.w.b.a.v0.n$e$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.v.b.a.v0.n$e$b:
     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
@@ -55155,7 +55977,7 @@
     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.w.b.a.v0.n$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.v.b.a.v0.n$f:
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> d
     com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
@@ -55170,7 +55992,7 @@
     174:176:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
     177:177:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):170:170 -> c
     177:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.w.b.a.v0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.v.b.a.v0.o:
     1:1:void <init>():183:183 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):196:197 -> d
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
@@ -55186,13 +56008,13 @@
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write(int[],int[],int):204:207 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.w.b.a.v0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.v.b.a.v0.p:
     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.w.b.a.v0.n$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.v.b.a.v0.n$g:
     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.w.b.a.v0.q.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.v.b.a.v0.q.a:
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
     java.lang.String moduleName -> d
@@ -55212,7 +56034,7 @@
     2:2:java.lang.String getAnonymousObjectOriginName():37:37 -> d
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> e
     1:1:java.lang.String getModuleName():36:36 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.w.b.a.v0.q.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.v.b.a.v0.q.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
@@ -55223,7 +56045,7 @@
     146:146:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():134:134 -> b
     2:2:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:134 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.w.b.a.v0.q.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.v.b.a.v0.q.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
     1:1:void <init>():82:82 -> <init>
@@ -55236,7 +56058,7 @@
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
     1:1:java.lang.String getLambdaClassOriginName():84:84 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():83:83 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.w.b.a.v0.q.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.v.b.a.v0.q.m:
     1:1:void <init>():17:17 -> <init>
     1:279: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):0:278 -> a
     1:279: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
@@ -55266,45 +56088,45 @@
     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.w.b.a.v0.q.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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$writePackageExtensions$1 -> com.android.tools.r8.w.b.a.v0.q.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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
@@ -55332,18 +56154,18 @@
     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.w.b.a.v0.q.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.v.b.a.v0.q.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.w.b.a.v0.q.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.v.b.a.v0.q.n:
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
     1:2:void <init>():61:62 -> <init>
@@ -55359,7 +56181,7 @@
     1:1:void setModuleName(java.lang.String):63:63 -> b
     1:1:java.util.List getLocalDelegatedProperties():62:62 -> d
     1:1:java.lang.String getModuleName():63:63 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.w.b.a.v0.q.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.v.b.a.v0.q.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
@@ -55378,7 +56200,7 @@
     1:1:int getJvmFlags():103:103 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():106:106 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():107:107 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.w.b.a.v0.q.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.v.b.a.v0.q.p:
     java.util.List annotations -> d
     boolean isRaw -> c
     1:3:void <init>():160:162 -> <init>
@@ -55393,7 +56215,7 @@
     187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
     1:1:java.util.List getAnnotations():162:162 -> c
     1:1:boolean isRaw():161:161 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.w.b.a.v0.q.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.v.b.a.v0.q.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
@@ -55405,24 +56227,26 @@
     185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
     186:186:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
     1:1:java.util.List getAnnotations():147:147 -> c
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.x.a:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.w.a:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.x.b:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.w.b:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,java.lang.String) -> a
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.w.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.x.c:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.x.d:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.w.d:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.w.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor get(int,java.lang.String,int,int) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.x.e:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.w.f:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.x.f:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.w.g:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor get(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.x.g:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.w.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.x.h:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.x.i:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.x.j:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.w.i:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.w.j:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.w.k:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.x.k:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.w.l:
     java.lang.String KOTLIN -> g
     java.lang.String NAME -> f
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
@@ -55430,84 +56254,84 @@
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
-    1:5:void <clinit>():27:31 -> <clinit>
-    1:47:void <init>(com.android.tools.r8.graph.DexItemFactory):53:99 -> <init>
-    48:56:void <init>(com.android.tools.r8.graph.DexItemFactory):97:105 -> <init>
-    57:62:void <init>(com.android.tools.r8.graph.DexItemFactory):103:108 -> <init>
-    63:70:void <init>(com.android.tools.r8.graph.DexItemFactory):107:114 -> <init>
-    71:71:void <init>(com.android.tools.r8.graph.DexItemFactory):113:113 -> <init>
-    72:81:void <init>(com.android.tools.r8.graph.DexItemFactory):110:119 -> <init>
-    1:1:java.lang.String addKotlinPrefix(java.lang.String):34:34 -> a
-    2:4:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.DexItemFactory,java.lang.Integer):116:116 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$new$1(com.android.tools.r8.graph.DexItemFactory,java.lang.Integer):118:118 -> b
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.x.k$a:
-com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.x.k$b:
+    1:5:void <clinit>():25:29 -> <clinit>
+    1:47:void <init>(com.android.tools.r8.graph.DexItemFactory):51:97 -> <init>
+    48:56:void <init>(com.android.tools.r8.graph.DexItemFactory):95:103 -> <init>
+    57:62:void <init>(com.android.tools.r8.graph.DexItemFactory):101:106 -> <init>
+    63:70:void <init>(com.android.tools.r8.graph.DexItemFactory):105:112 -> <init>
+    71:71:void <init>(com.android.tools.r8.graph.DexItemFactory):111:111 -> <init>
+    72:81:void <init>(com.android.tools.r8.graph.DexItemFactory):108:117 -> <init>
+    1:1:java.lang.String addKotlinPrefix(java.lang.String):32:32 -> a
+    2:4:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.DexItemFactory,java.lang.Integer):114:114 -> a
+    1:1:com.android.tools.r8.graph.DexType lambda$new$1(com.android.tools.r8.graph.DexItemFactory,java.lang.Integer):116:116 -> b
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.w.l$a:
+com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.w.l$b:
     java.lang.String arrayBinaryName -> a
     java.lang.String anyName -> b
-    1:2:void <clinit>():46:47 -> <clinit>
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.x.k$c:
+    1:2:void <clinit>():44:45 -> <clinit>
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.w.l$c:
     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>():122:122 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):122:122 -> <init>
-    2:2:void <init>(com.android.tools.r8.kotlin.Kotlin):140:140 -> <init>
-    3:7:void <init>(com.android.tools.r8.kotlin.Kotlin):133:137 -> <init>
-    8:8:void <init>(com.android.tools.r8.kotlin.Kotlin):135:135 -> <init>
-    9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):134:151 -> <init>
-    27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):149:149 -> <init>
-    1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):136:136 -> a
-    2:2:int getArity(com.android.tools.r8.graph.DexType):159:159 -> a
-    3:3:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):155:155 -> a
-    3:3:int getArity(com.android.tools.r8.graph.DexType):159 -> a
-    4:6:int getArity(com.android.tools.r8.graph.DexType):159:161 -> a
-    1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):155:155 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.x.k$d:
+    1:1:void <clinit>():120:120 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):120:120 -> <init>
+    2:2:void <init>(com.android.tools.r8.kotlin.Kotlin):138:138 -> <init>
+    3:7:void <init>(com.android.tools.r8.kotlin.Kotlin):131:135 -> <init>
+    8:8:void <init>(com.android.tools.r8.kotlin.Kotlin):133:133 -> <init>
+    9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):132:149 -> <init>
+    27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):147:147 -> <init>
+    1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):134:134 -> a
+    2:2:int getArity(com.android.tools.r8.graph.DexType):157:157 -> a
+    3:3:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):153:153 -> a
+    3:3:int getArity(com.android.tools.r8.graph.DexType):157 -> a
+    4:6:int getArity(com.android.tools.r8.graph.DexType):157:159 -> a
+    1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):153:153 -> b
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.w.l$d:
     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):185:188 -> <init>
-    5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):187:190 -> <init>
-    9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):189:193 -> <init>
-    14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):192:192 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.x.k$e:
-    com.android.tools.r8.graph.DexString kind -> b
-    com.android.tools.r8.graph.DexString metadataVersion -> c
-    com.android.tools.r8.graph.DexString bytecodeVersion -> d
-    com.android.tools.r8.kotlin.Kotlin this$0 -> j
-    com.android.tools.r8.graph.DexString data1 -> e
-    com.android.tools.r8.graph.DexString data2 -> f
-    com.android.tools.r8.graph.DexString extraString -> g
-    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):165:174 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.x.k$f:
+    1:4:void <init>(com.android.tools.r8.kotlin.Kotlin):182:185 -> <init>
+    5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):184:187 -> <init>
+    9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):186:190 -> <init>
+    14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):189:189 -> <init>
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.w.l$e:
+    com.android.tools.r8.graph.DexString kind -> a
+    com.android.tools.r8.graph.DexString metadataVersion -> b
+    com.android.tools.r8.graph.DexString bytecodeVersion -> c
+    com.android.tools.r8.kotlin.Kotlin this$0 -> i
+    com.android.tools.r8.graph.DexString data1 -> d
+    com.android.tools.r8.graph.DexString data2 -> e
+    com.android.tools.r8.graph.DexString extraString -> f
+    com.android.tools.r8.graph.DexString packageName -> g
+    com.android.tools.r8.graph.DexString extraInt -> h
+    1:9:void <init>(com.android.tools.r8.kotlin.Kotlin):163:171 -> <init>
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.w.l$f:
     com.android.tools.r8.graph.DexString enabledFieldName -> b
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexField enabledField -> c
     com.android.tools.r8.kotlin.Kotlin this$0 -> d
-    1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):177:181 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.x.l:
+    1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):174:178 -> <init>
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.w.m:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.graph.DexType annotationType -> a
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):29:31 -> <init>
-    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):41:45 -> a
-    6:8:com.android.tools.r8.kotlin.KotlinAnnotationInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.graph.AppView):35:37 -> a
-    6:8:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):46 -> a
-    9:11:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):46:48 -> a
-    12:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:61 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.x.m:
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):32:34 -> <init>
+    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier):46:50 -> a
+    6:8:com.android.tools.r8.kotlin.KotlinAnnotationInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,com.android.tools.r8.graph.DexDefinitionSupplier):39:41 -> a
+    6:8:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier):51 -> a
+    9:11:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier):51:53 -> a
+    12:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):60:66 -> a
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.w.n:
     com.android.tools.r8.graph.DexType anonymousObjectOrigin -> k
     java.util.List typeParameters -> f
     java.util.List constructorsWithNoBacking -> d
+    java.lang.String packageName -> l
     java.util.List enumEntries -> j
     java.util.List nestedClasses -> i
     java.util.List sealedSubClasses -> h
@@ -55516,221 +56340,259 @@
     java.lang.String name -> b
     int flags -> a
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo declarationContainerInfo -> e
-    1:12:void <init>(int,java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType):57:68 -> <init>
-    1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):190:201 -> a
-    13:13:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):133:133 -> a
-    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):202 -> a
+    1:13:void <init>(int,java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.String):63:75 -> <init>
+    1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):196:207 -> a
+    13:13:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):156:156 -> a
+    13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):208 -> a
     14:58:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.setName(java.lang.String):0:44 -> a
-    14:58:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):199 -> a
-    59:61:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):204:206 -> a
+    14:58:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):205 -> a
+    59:61:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):210:212 -> a
     62:90:void com.android.tools.r8.kotlin.KotlinCompanionInfo.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):0:28 -> a
-    62:90:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):206 -> a
-    91:118:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):210:237 -> a
-    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    119:119:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):238 -> a
-    120:120:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):240:240 -> a
-    121:121:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):133:133 -> a
-    121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):240 -> a
-    122:127:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):243:248 -> a
-    128:128:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    128:128:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):249 -> a
-    129:129:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):252:252 -> a
-    130:130:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):133:133 -> a
-    130:130:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):251 -> a
-    131:131:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):254:254 -> a
-    132:140:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):253:261 -> a
-    141:170:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):0:29 -> a
-    141:170:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):261 -> a
-    171:172:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):262:263 -> a
-    173:173:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):133:133 -> a
-    173:173:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):264 -> a
-    174:213:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):0:39 -> a
-    174:213:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):263 -> a
-    214:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):267:269 -> a
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.x.n:
+    62:90:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):212 -> a
+    91:105:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):216:230 -> a
+    106:125:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):227:246 -> a
+    126:126:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):156:156 -> a
+    126:126:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):246 -> a
+    127:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):249:258 -> a
+    137:137:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):156:156 -> a
+    137:137:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):257 -> a
+    138:138:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):260:260 -> a
+    139:147:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):259:267 -> a
+    148:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):0:29 -> a
+    148:177:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):267 -> a
+    178:179:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):268:269 -> a
+    180:180:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):156:156 -> a
+    180:180:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):270 -> a
+    181:220:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):0:39 -> a
+    181:220:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):269 -> a
+    221:223:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):273:275 -> a
+    1:1:java.lang.String getPackageName():280:280 -> g
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.w.o:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
-    boolean isSyntheticClass() -> h
-    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> i
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.x.p:
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.Kotlin.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):0:0 -> a
-    1:1:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23 -> a
-    2:25:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):27:50 -> a
-    2:25:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.Kotlin.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):198 -> a
-    2:25:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23 -> a
-    26:26:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):45:45 -> a
-    26:26:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.Kotlin.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):198 -> a
-    26:26:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23 -> a
-    27:34:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):33:40 -> a
-    27:34:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.Kotlin.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):198 -> a
-    27:34:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23 -> a
-    35:53:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView) -> a
-    35:53:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.Kotlin.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):198 -> a
-    35:53:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23 -> a
-    54:54:void com.android.tools.r8.kotlin.KotlinInfoCollector.lambda$computeKotlinInfoForProgramClasses$0(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):23:23 -> a
-    55:60:void com.android.tools.r8.kotlin.KotlinInfoCollector.computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):16:21 -> a
-    61:61:void com.android.tools.r8.kotlin.KotlinInfoCollector.computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):20:20 -> a
-    62:88:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):58:84 -> a
-    89:89:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):65:65 -> a
-    90:94:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):89:93 -> a
-    95:97:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):72:74 -> a
-    95:97:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    98:98:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):42:42 -> a
-    98:98:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74 -> a
-    98:98:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    99:120:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):74:95 -> a
-    99:120:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    121:132:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):161:172 -> a
-    121:132:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):96 -> a
-    121:132:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    133:133:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):43:43 -> a
-    133:133:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):174 -> a
-    133:133:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):96 -> a
-    133:133:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    134:134:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    134:134:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
-    134:134:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):174 -> a
-    134:134:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):96 -> a
-    134:134:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    135:140:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44:49 -> a
-    135:140:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):174 -> a
-    135:140:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):96 -> a
-    135:140:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    141:141:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):174:174 -> a
-    141:141:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):96 -> a
-    141:141:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    142:143:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):97:98 -> a
-    142:143:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    144:171:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:27 -> a
-    144:171:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):100 -> a
-    144:171:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    172:174:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):102:104 -> a
-    172:174:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    175:179:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSuperTypes(java.util.List,com.android.tools.r8.graph.AppView):153:157 -> a
-    175:179:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):104 -> a
-    175:179:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    180:180:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):105:105 -> a
-    180:180:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    181:192:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSealedSubClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.AppView):138:149 -> a
-    181:192:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):105 -> a
-    181:192:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    193:193:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):106:106 -> a
-    193:193:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    194:204:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.AppView):123:133 -> a
-    194:204:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):106 -> a
-    194:204:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    205:205:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):107:107 -> a
-    205:205:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    206:243:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:37 -> a
-    206:243:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.AppView):112 -> a
-    206:243:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):108 -> a
-    206:243:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    244:245:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.AppView):115:116 -> a
-    244:245:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):108 -> a
-    244:245:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    246:246:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):108:108 -> a
-    246:246:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):92 -> a
-    247:263:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.AppView):94:110 -> a
-    264:271:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):115:122 -> a
-    272:272:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):116:116 -> a
-    1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):141:144 -> b
-    5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):142:142 -> b
-    1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):128:135 -> c
-    9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):129:129 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.x.o:
-    1:1:void <init>(java.lang.String):149:149 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.x.w:
-    1:1:void <init>():19:19 -> <init>
+    java.lang.String getPackageName() -> g
+    boolean isSyntheticClass() -> i
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> j
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.w.p:
+    1:26:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):73:98 -> a
+    27:368:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
+    27:368:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    27:368:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    369:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):339:352 -> a
+    369:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    369:382:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):351:351 -> a
+    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    383:383:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):350:350 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    384:384:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):349:349 -> a
+    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    386:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
+    386:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    386:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    387:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):347:357 -> a
+    387:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    387:397:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):355:355 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    398:398:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):99 -> a
+    399:399:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):80:80 -> a
+    400:403:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):109:112 -> a
+    404:406:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):85:87 -> a
+    404:406:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    407:407:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):65:65 -> a
+    407:407:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):87 -> a
+    407:407:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    408:430:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):87:109 -> a
+    408:430:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    431:437:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):169:175 -> a
+    431:437:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    431:437:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    438:438:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):43:43 -> a
+    438:438:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):180 -> a
+    438:438:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    438:438:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    439:439:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    439:439:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
+    439:439:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):180 -> a
+    439:439:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    439:439:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    440:445:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44:49 -> a
+    440:445:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):180 -> a
+    440:445:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    440:445:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    446:446:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):179:179 -> a
+    446:446:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    446:446:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    447:448:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):112:113 -> a
+    447:448:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    449:476:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:27 -> a
+    449:476:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):115 -> a
+    449:476:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    477:479:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):117:119 -> a
+    477:479:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    480:484:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSuperTypes(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):161:165 -> a
+    480:484:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):119 -> a
+    480:484:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    485:485:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120:120 -> a
+    485:485:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    486:493:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getSealedSubClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier):149:156 -> a
+    486:493:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
+    486:493:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    494:494:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):121:121 -> a
+    494:494:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    495:501:java.util.List com.android.tools.r8.kotlin.KotlinClassInfo.getNestedClasses(com.android.tools.r8.graph.DexClass,java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier):138:144 -> a
+    495:501:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):121 -> a
+    495:501:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    502:502:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):122:122 -> a
+    502:502:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    503:540:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:37 -> a
+    503:540:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexDefinitionSupplier):129 -> a
+    503:540:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):123 -> a
+    503:540:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    541:541:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexDefinitionSupplier):131:131 -> a
+    541:541:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):123 -> a
+    541:541:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    542:542:com.android.tools.r8.kotlin.KotlinClassInfo com.android.tools.r8.kotlin.KotlinClassInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):123:123 -> a
+    542:542:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):111 -> a
+    543:574:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):118:149 -> a
+    575:582:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):154:161 -> a
+    583:583:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):155:155 -> a
+    1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):180:183 -> b
+    5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):181:181 -> b
+    1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):167:174 -> c
+    9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):168:168 -> c
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.w.p$a:
+    1:1:void <init>(java.lang.String):188:188 -> <init>
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.w.w:
+    1:1:void <init>():23:23 -> <init>
     void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.x.q:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.x.r:
+    1:9:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):27:35 -> a
+    10:13:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):34:37 -> a
+    14:17:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinMetadataUtils.referenceTypeFromDescriptor(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):167:170 -> a
+    14:17:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):38 -> a
+    18:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):38:47 -> a
+    28:29:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
+    28:29:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):47 -> a
+    30:31:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):47:48 -> a
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.w.q:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.w.r:
     com.android.tools.r8.graph.DexType type -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):53:53 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexType):57:58 -> <init>
-    1:7:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):65:71 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.x.s:
+    boolean isLocalOrAnonymous -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):55:55 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType,boolean):60:62 -> <init>
+    1:10:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68:77 -> a
+    11:14:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):76:79 -> a
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.w.s:
     java.lang.String typeAlias -> a
-    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):90:90 -> <init>
-    2:3:void <init>(java.lang.String):94:95 -> <init>
-    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):101:101 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.x.t:
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):99:99 -> <init>
+    2:3:void <init>(java.lang.String):103:104 -> <init>
+    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):110:110 -> a
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.w.t:
     int typeId -> a
-    1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):75:75 -> <init>
-    2:3:void <init>(int):79:80 -> <init>
-    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):86:86 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.x.u:
+    1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):84:84 -> <init>
+    2:3:void <init>(int):88:89 -> <init>
+    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):95:95 -> a
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.w.u:
     java.lang.String classifier -> a
-    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):105:105 -> <init>
-    2:3:void <init>(java.lang.String):108:109 -> <init>
-    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):115:115 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.x.v:
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):114:114 -> <init>
+    2:3:void <init>(java.lang.String):117:118 -> <init>
+    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):124:124 -> a
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.w.v:
     java.lang.String classifier -> a
-    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):119:119 -> <init>
-    2:3:void <init>(java.lang.String):122:123 -> <init>
-    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):129:129 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.x.x:
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):128:128 -> <init>
+    2:3:void <init>(java.lang.String):131:132 -> <init>
+    1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):138:138 -> a
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.w.x:
     1:1:void <init>():13:13 -> <init>
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.x.y:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.w.y:
     java.util.List valueParameterInfos -> b
     int flags -> a
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> c
-    1:4:void <init>(int,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):29:32 -> <init>
-    1:4:com.android.tools.r8.kotlin.KotlinConstructorInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.AppView):36:39 -> a
-    5:7:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):50:52 -> a
-    8:8:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
-    8:8:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):52 -> a
-    9:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):0:25 -> a
-    9:34:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145 -> a
-    9:34:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):52 -> a
-    35:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145:145 -> a
-    35:35:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):52 -> a
-    36:39:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):54:57 -> a
+    1:4:void <init>(int,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):31:34 -> <init>
+    1:4:com.android.tools.r8.kotlin.KotlinConstructorInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):39:42 -> a
+    5:8:com.android.tools.r8.kotlin.KotlinConstructorInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):41:44 -> a
+    9:9:com.android.tools.r8.kotlin.KotlinConstructorInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):43:43 -> a
+    10:12:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:57 -> a
+    13:13:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):0:0 -> a
+    13:13:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57 -> a
+    14:39:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):0:25 -> a
+    14:39:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145 -> a
+    14:39:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57 -> a
+    40:40:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):145:145 -> a
+    40:40:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57 -> a
+    41:44:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):59:62 -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
-    boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.x.A:
+    boolean isConstructor() -> l
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.w.A:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:4:void <init>(java.util.List,java.util.List,java.util.List):40:43 -> <init>
-    1:12:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView):51:62 -> a
-    13:15:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):105:107 -> a
-    13:15:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView):62 -> a
-    16:53:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView):74:111 -> a
-    54:58:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.AppView):118:122 -> a
-    54:58:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView):111 -> a
-    59:60:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.AppView):112:113 -> a
-    61:70:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):133:142 -> a
-    71:103:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):141:173 -> a
-    104:117:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):169:182 -> a
-    118:118:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):142:142 -> a
-    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):159:159 -> b
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.x.z:
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:4:void <init>(java.util.List,java.util.List,java.util.List):44:47 -> <init>
+    1:13:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):57:69 -> a
+    14:16:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):128:130 -> a
+    14:16:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):69 -> a
+    17:17:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):81:81 -> a
+    18:19:void keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):129:130 -> a
+    18:19:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):81 -> a
+    20:42:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):82:104 -> a
+    43:44:void keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):136:137 -> a
+    43:44:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):104 -> a
+    45:53:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):105:113 -> a
+    54:55:void keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):136:137 -> a
+    54:55:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):113 -> a
+    56:64:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):114:122 -> a
+    65:69:java.util.List getTypeAliases(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):143:147 -> a
+    65:69:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):122 -> a
+    70:71:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):123:124 -> a
+    72:81:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):158:167 -> a
+    82:114:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):166:198 -> a
+    115:128:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):194:207 -> a
+    129:129:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):167:167 -> a
+    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):184:184 -> b
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.w.z:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():186:186 -> <clinit>
-    1:5:void <init>():186:190 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField access$000(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):186:186 -> a
-    2:3:void setBackingField(com.android.tools.r8.graph.DexEncodedField):193:194 -> a
-    4:5:void setGetter(com.android.tools.r8.graph.DexEncodedMethod):198:199 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):186:186 -> b
-    2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):203:204 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):186:186 -> c
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.x.B:
+    1:1:void <clinit>():211:211 -> <clinit>
+    1:5:void <init>():211:215 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedField access$000(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):211:211 -> a
+    2:3:void setBackingField(com.android.tools.r8.graph.DexEncodedField):218:219 -> a
+    4:5:void setGetter(com.android.tools.r8.graph.DexEncodedMethod):223:224 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):211:211 -> b
+    2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):228:229 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):211:211 -> c
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.w.B:
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> b
     boolean isCompanion() -> e
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
-    boolean isFieldProperty() -> j
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.x.C:
+    boolean isFieldProperty() -> k
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.w.C:
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
-    1:2:void <init>(com.android.tools.r8.kotlin.KotlinPackageInfo):21:22 -> <init>
-    1:2:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):27:28 -> a
-    3:7:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:48 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.x.D:
+    java.lang.String packageName -> b
+    1:3:void <init>(com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String):26:28 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):38:40 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):39:39 -> a
+    5:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57:61 -> a
+    1:1:java.lang.String getPackageName():66:66 -> g
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.w.D:
+    java.lang.String typeFlexibilityId -> i
+    com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> j
+    boolean $assertionsDisabled -> k
+    1:4:void <clinit>():17:20 -> <clinit>
+    1:10:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo,java.lang.String):35:44 -> <init>
+    1:12:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):52:63 -> a
+    13:15:com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):62:64 -> a
+    16:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):71:75 -> a
+    21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):75:75 -> a
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.w.E:
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo returnType -> d
@@ -55739,50 +56601,62 @@
     com.android.tools.r8.graph.DexType lambdaClassOrigin -> h
     java.lang.String name -> b
     int flags -> a
-    1:9:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.graph.DexType):46:54 -> <init>
+    1:9:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.graph.DexType):49:57 -> <init>
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> a
-    1:8:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):58:65 -> a
-    9:9:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:0 -> a
-    9:9:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):70 -> a
-    9:9:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):66 -> a
-    10:29:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
-    10:29:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79 -> a
-    10:29:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):70 -> a
-    10:29:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):66 -> a
-    30:30:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79:79 -> a
-    30:30:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):70 -> a
-    30:30:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):66 -> a
-    31:32:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):73:74 -> a
-    31:32:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):66 -> a
-    33:33:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.AppView):66:66 -> a
-    34:60:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):85:111 -> a
-    61:61:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):133:133 -> a
-    61:61:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):112 -> a
-    62:62:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):111:111 -> a
+    1:7:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):62:68 -> a
+    8:11:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):67:70 -> a
+    12:15:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):69:72 -> a
+    16:16:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):71:71 -> a
+    17:17:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:0 -> a
+    17:17:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier):78 -> a
+    17:17:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):73 -> a
+    18:37:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> a
+    18:37:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79 -> a
+    18:37:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier):78 -> a
+    18:37:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):73 -> a
+    38:38:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79:79 -> a
+    38:38:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier):78 -> a
+    38:38:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):73 -> a
+    39:39:com.android.tools.r8.graph.DexType getlambdaClassOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
+    39:39:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):73 -> a
+    40:40:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):73:73 -> a
+    41:67:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):91:117 -> a
+    68:68:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.kotlinNameFromDescriptor(com.android.tools.r8.graph.DexString):156:156 -> a
+    68:68:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):118 -> a
+    69:69:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):117:117 -> a
     boolean isFunction() -> d
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.x.E:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.w.F:
     com.android.tools.r8.graph.DexType type -> a
     java.lang.String name -> b
-    1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexType):25:27 -> <init>
-    1:2:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.AppView):35:36 -> a
-    3:13:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature rewrite(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:51 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.x.F:
+    1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexType):27:29 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
+    4:7:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinMetadataUtils.referenceTypeFromDescriptor(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):167:170 -> a
+    4:7:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexDefinitionSupplier):39 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexDefinitionSupplier):39:39 -> a
+    9:19:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature rewrite(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:54 -> a
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.w.G:
     java.util.List EMPTY_PARAMETERS_LIST -> d
     java.util.List parameters -> c
     java.lang.String name -> a
     com.android.tools.r8.graph.DexType returnType -> b
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:4:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.util.List):32:35 -> <init>
-    1:15:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.AppView):43:57 -> a
-    16:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):62:78 -> a
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.x.G:
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:4:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.util.List):33:36 -> <init>
+    1:2:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexDefinitionSupplier):44:45 -> a
+    3:6:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinMetadataUtils.referenceTypeFromDescriptor(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):167:170 -> a
+    3:6:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexDefinitionSupplier):46 -> a
+    7:13:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexDefinitionSupplier):47:53 -> a
+    14:17:com.android.tools.r8.graph.DexType com.android.tools.r8.kotlin.KotlinMetadataUtils.referenceTypeFromDescriptor(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):167:170 -> a
+    14:17:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexDefinitionSupplier):54 -> a
+    18:21:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexDefinitionSupplier):54:57 -> a
+    22:38:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature rewrite(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):62:78 -> a
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.w.H:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.kotlin.KotlinFunctionInfo):24:25 -> <init>
-    1:13:com.android.tools.r8.kotlin.KotlinLambdaInfo create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,com.android.tools.r8.graph.AppView):30:42 -> a
-    14:17:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:58 -> a
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.x.H:
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.kotlin.KotlinFunctionInfo):26:27 -> <init>
+    1:14:com.android.tools.r8.kotlin.KotlinLambdaInfo create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):36:49 -> a
+    15:18:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):62:65 -> a
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.w.I:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -55790,296 +56664,332 @@
     1:1:java.lang.String getDiagnosticMessage():38:38 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():28:28 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():33:33 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.x.I:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.w.J:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Set keepByteCodeFunctions -> c
+    com.android.tools.r8.graph.DexDefinitionSupplier definitionSupplier -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinitionSupplier):24:24 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinitionSupplier):21:26 -> <init>
+    1:21:void done(com.android.tools.r8.shaking.Enqueuer):31:51 -> a
+    22:28:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):42:48 -> a
+    29:53:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):40:64 -> a
+    29:53:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):43 -> a
+    54:60:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):59:65 -> a
+    54:60:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):43 -> a
+    61:67:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):51:51 -> a
+    61:67:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):43 -> a
+    73:84:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):57:68 -> a
+    73:84:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):43 -> a
+    85:85:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):42:42 -> a
+    86:86:void lambda$done$0(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> a
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.w.K:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> d
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):36:40 -> <init>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):34:38 -> <init>
     com.android.tools.r8.graph.DexAnnotation lambda$run$1(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation) -> a
-    1:5:void removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):56:60 -> a
-    6:7:boolean isNotKotlinMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):65:66 -> a
-    6:7:boolean lambda$removeKotlinMetadataFromRenamedClass$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):56 -> a
-    8:10:void run(java.util.concurrent.ExecutorService):71:73 -> a
-    11:37:void run(java.util.concurrent.ExecutorService):72:98 -> a
-    38:51:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):75:88 -> a
-    52:56:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):87:91 -> a
-    57:61:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):67:71 -> a
-    57:61:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):93 -> a
-    62:64:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):340:342 -> a
-    62:64:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74 -> a
-    62:64:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):93 -> a
-    65:65:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74:74 -> a
-    65:65:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):93 -> a
-    66:66:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
-    67:69:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):102:104 -> a
-    70:74:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):103:107 -> a
-    75:80:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):105:110 -> a
-    81:85:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):108:112 -> a
-    86:89:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):111:114 -> a
-    90:95:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):113:118 -> a
-    96:103:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):115:122 -> a
-    104:110:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):119:125 -> a
-    111:117:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):123:129 -> a
-    118:122:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):133:137 -> a
-    123:127:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):141:145 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.x.N:
+    1:3:void run(java.util.concurrent.ExecutorService):46:46 -> a
+    4:26:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):49:71 -> a
+    27:31:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):70:74 -> a
+    32:36:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):67:71 -> a
+    32:36:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    37:39:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):340:342 -> a
+    37:39:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74 -> a
+    37:39:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    40:40:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74:74 -> a
+    40:40:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    41:41:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):76:76 -> a
+    42:42:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):62:62 -> a
+    43:43:void lambda$run$2(com.android.tools.r8.graph.DexProgramClass):61:61 -> a
+    44:44:boolean lambda$run$0(com.android.tools.r8.graph.DexAnnotation):62:62 -> a
+    45:45:boolean isNotKotlinMetadata(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):42:42 -> a
+    45:45:boolean lambda$run$0(com.android.tools.r8.graph.DexAnnotation):62 -> a
+    46:48:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):84:86 -> a
+    49:53:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):85:89 -> a
+    54:59:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):87:92 -> a
+    60:64:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):90:94 -> a
+    65:68:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):93:96 -> a
+    69:74:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):95:100 -> a
+    75:81:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):97:103 -> a
+    82:87:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):101:106 -> a
+    88:94:com.android.tools.r8.graph.DexAnnotation createKotlinMetadataAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,java.lang.String):104:110 -> a
+    95:99:com.android.tools.r8.graph.DexValue$DexValueArray createIntArray(int[]):114:118 -> a
+    100:104:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):122:126 -> a
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.w.P:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):46:53 -> a
-    9:14:java.lang.String toRenamedDescriptorOrDefault(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):122:127 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.x.J:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.x.M:
+    com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
+    1:2:void <clinit>():35:36 -> <clinit>
+    1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):69:76 -> a
+    9:14:java.lang.String toRenamedDescriptorOrDefault(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):145:150 -> a
+    15:15:com.android.tools.r8.graph.DexType referenceTypeFromBinaryName(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):162:162 -> a
+    16:19:com.android.tools.r8.graph.DexType referenceTypeFromDescriptor(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):167:170 -> a
+    16:19:com.android.tools.r8.graph.DexType referenceTypeFromBinaryName(java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):161 -> a
+    20:28:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):180:188 -> a
+    29:46:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):198:215 -> a
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.w.L:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.w.O:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):63:63 -> <init>
-    2:9:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):57:64 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$100(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):56:56 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$102(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):56:56 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$202(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):56:56 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature():91:91 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$200(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):56:56 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$302(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):56:56 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():95:95 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):56:56 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():99:99 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.x.L:
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):86:86 -> <init>
+    2:9:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):80:87 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$100(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):79:79 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$102(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):79:79 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$202(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):79:79 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature():114:114 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$200(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):79:79 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$302(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):79:79 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():118:118 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):79:79 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():122:122 -> c
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.w.N:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
-    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):65:65 -> <init>
-    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):68:71 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.x.K:
+    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):88:88 -> <init>
+    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):91:94 -> a
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.w.M:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):71:71 -> <init>
-    1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):78:83 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.x.N$a:
-    1:1:void <init>():31:31 -> <init>
-    2:2:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$1):31:31 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):37:37 -> a
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.x.O:
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):94:94 -> <init>
+    1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):101:106 -> a
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.w.P$a:
+    java.lang.String name -> a
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):38:38 -> <init>
+    2:3:void <init>(java.lang.String):43:44 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:55 -> a
+    1:1:java.lang.String getPackageName():60:60 -> g
+    1:1:java.lang.String toString():49:49 -> toString
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.w.Q:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <clinit>():41:41 -> <clinit>
     1:53:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:52 -> a
-    1:53:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):290 -> a
-    54:54:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):290:290 -> a
-    55:55:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):286:286 -> a
-    56:60:void writeKotlinMetadataAnnotation(java.lang.String,com.android.tools.r8.graph.DexAnnotation,java.io.PrintStream,com.android.tools.r8.kotlin.Kotlin):46:50 -> a
-    61:68:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):56:63 -> a
-    69:71:java.lang.String kotlinMultiFileClassFacadeMetadataString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String):104:106 -> a
-    69:71:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):63 -> a
-    72:79:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):65:72 -> a
-    80:88:java.lang.String kotlinClassMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):78:86 -> a
-    89:89:void lambda$kotlinClassMetadataToString$0(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):84:84 -> a
-    90:98:java.lang.String kotlinFileFacadeMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):91:99 -> a
-    99:99:void lambda$kotlinFileFacadeMetadataToString$1(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):97:97 -> a
-    100:110:java.lang.String kotlinMultiFileClassPartToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):112:122 -> a
-    111:134:java.lang.String kotlinSyntheticClassToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String):127:150 -> a
-    135:148:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String):134:147 -> a
-    149:149:void lambda$kotlinSyntheticClassToString$3(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,java.lang.String):141:141 -> a
-    150:154:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.List,java.util.function.BiConsumer):177:181 -> a
-    155:158:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String) -> a
-    155:158:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.List,java.util.function.BiConsumer):181 -> a
-    159:162:void lambda$appendKmList$6(java.util.List,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):185:188 -> a
-    163:164:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):197:198 -> a
-    165:168:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):155:158 -> a
-    165:168:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):198 -> a
-    169:169:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):198:198 -> a
-    170:171:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):202:203 -> a
-    172:175:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):155:158 -> a
-    172:175:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):203 -> a
-    176:176:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):203:203 -> a
-    177:229:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):208:260 -> a
-    230:232:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):217:219 -> a
-    233:236:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):218:221 -> a
-    237:237:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):213:213 -> a
-    238:238:java.lang.String lambda$appendKmDeclarationContainer$9(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):220:220 -> a
-    239:239:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):223:223 -> a
-    240:253:java.lang.String lambda$appendKmDeclarationContainer$12(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty) -> a
+    1:53:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):291 -> a
+    54:54:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):291:291 -> a
+    55:55:void lambda$appendKmPackage$18(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):287:287 -> a
+    56:60:void writeKotlinMetadataAnnotation(java.lang.String,com.android.tools.r8.graph.DexAnnotation,java.io.PrintStream,com.android.tools.r8.kotlin.Kotlin):47:51 -> a
+    61:68:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):57:64 -> a
+    69:71:java.lang.String kotlinMultiFileClassFacadeMetadataString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String):105:107 -> a
+    69:71:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):64 -> a
+    72:79:java.lang.String kotlinMetadataToString(java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):66:73 -> a
+    80:88:java.lang.String kotlinClassMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):79:87 -> a
+    89:89:void lambda$kotlinClassMetadataToString$0(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String):85:85 -> a
+    90:98:java.lang.String kotlinFileFacadeMetadataToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):92:100 -> a
+    99:99:void lambda$kotlinFileFacadeMetadataToString$1(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String):98:98 -> a
+    100:110:java.lang.String kotlinMultiFileClassPartToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):113:123 -> a
+    111:134:java.lang.String kotlinSyntheticClassToString(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String):128:151 -> a
+    135:148:void lambda$kotlinSyntheticClassToString$4(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.StringBuilder,java.lang.String) -> a
+    149:149:void lambda$kotlinSyntheticClassToString$3(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,java.lang.String):142:142 -> a
+    150:154:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.List,java.util.function.BiConsumer):178:182 -> a
+    155:158:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):156:159 -> a
+    155:158:void appendKmList(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.List,java.util.function.BiConsumer):182 -> a
+    159:162:void lambda$appendKmList$6(java.util.List,java.lang.StringBuilder,java.lang.String,java.util.function.BiConsumer):186:189 -> a
+    163:164:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):198:199 -> a
+    165:168:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):156:159 -> a
+    165:168:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):199 -> a
+    169:169:void lambda$appendKeyValue$7(java.util.function.Consumer,java.lang.String):199:199 -> a
+    170:171:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):203:204 -> a
+    172:175:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):156:159 -> a
+    172:175:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):204 -> a
+    176:176:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):204:204 -> a
+    177:229:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):209:261 -> a
+    230:232:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):218:220 -> a
+    233:236:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):219:222 -> a
+    237:237:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):214:214 -> a
+    238:238:java.lang.String lambda$appendKmDeclarationContainer$9(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):221:221 -> a
+    239:239:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):224:224 -> a
+    240:253:java.lang.String lambda$appendKmDeclarationContainer$12(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):241:254 -> a
     254:254:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():271:271 -> a
-    254:254:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):119 -> a
-    255:257:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):118:120 -> a
-    258:258:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):273:273 -> a
-    259:259:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):279:279 -> a
+    254:254:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):120 -> a
+    255:257:void lambda$kotlinMultiFileClassPartToString$2(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String):119:121 -> a
+    258:258:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):274:274 -> a
+    259:259:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):280:280 -> a
     260:318:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:58 -> a
-    260:318:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):280 -> a
-    319:320:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):280:281 -> a
-    321:346:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):298:323 -> a
-    347:355:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):322:330 -> a
-    356:362:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):326:332 -> a
-    363:363:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):331:331 -> a
+    260:318:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):281 -> a
+    319:320:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):281:282 -> a
+    321:346:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):299:324 -> a
+    347:355:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):323:331 -> a
+    356:362:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):327:333 -> a
+    363:363:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):332:332 -> a
     364:401:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:37 -> a
-    364:401:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):337 -> a
-    402:402:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):333:333 -> a
+    364:401:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):338 -> a
+    402:402:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):334:334 -> a
     403:430:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:27 -> a
-    403:430:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):338 -> a
-    431:464:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):338:371 -> a
-    465:465:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):305:305 -> a
-    466:466:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):318:318 -> a
-    467:467:void lambda$appendKmClass$22(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):350:350 -> a
-    468:468:java.lang.String lambda$appendKmClass$24(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):365:365 -> a
-    469:469:void lambda$appendKmClass$25(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):368:368 -> a
-    470:470:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):376:376 -> a
-    471:471:void lambda$appendKmConstructor$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):387:387 -> a
-    472:472:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):395:395 -> a
-    473:473:void lambda$appendKmFunction$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):406:406 -> a
-    474:474:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):434:434 -> a
-    475:475:void lambda$appendKmProperty$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):445:445 -> a
-    476:479:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):494:497 -> a
-    480:480:void lambda$appendKmType$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):513:513 -> a
-    481:481:void lambda$appendKmType$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):509:509 -> a
-    482:482:void lambda$appendKmType$39(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):515:515 -> a
-    483:483:void lambda$appendKmType$41(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):522:522 -> a
-    484:484:void lambda$appendKmType$43(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):540:540 -> a
-    485:485:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):548:548 -> a
-    486:486:void lambda$appendKmTypeProjection$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):558:558 -> a
-    487:487:void lambda$appendValueParameters$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):574:574 -> a
-    488:491:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):581:584 -> a
-    492:492:void lambda$appendValueParameter$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):596:596 -> a
-    493:493:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):610:610 -> a
-    494:494:void lambda$appendTypeParameters$52(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):616:616 -> a
-    495:495:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):622:622 -> a
-    496:496:void lambda$appendTypeParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):640:640 -> a
-    497:497:void lambda$appendTypeParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):636:636 -> a
-    498:498:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):663:663 -> a
-    499:499:void lambda$appendTypeAlias$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):677:677 -> a
-    500:500:void lambda$appendTypeAlias$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):673:673 -> a
-    501:501:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):710:710 -> a
-    502:503:void lambda$appendKmAnnotation$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):715:716 -> a
-    504:506:void lambda$appendKmAnnotation$64(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):721:723 -> a
+    403:430:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):339 -> a
+    431:464:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):339:372 -> a
+    465:465:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):306:306 -> a
+    466:466:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):319:319 -> a
+    467:467:void lambda$appendKmClass$22(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):351:351 -> a
+    468:468:java.lang.String lambda$appendKmClass$24(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):366:366 -> a
+    469:469:void lambda$appendKmClass$25(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):369:369 -> a
+    470:470:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):377:377 -> a
+    471:471:void lambda$appendKmConstructor$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):388:388 -> a
+    472:472:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):396:396 -> a
+    473:473:void lambda$appendKmFunction$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):407:407 -> a
+    474:474:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):435:435 -> a
+    475:475:void lambda$appendKmProperty$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):446:446 -> a
+    476:479:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):495:498 -> a
+    480:480:void lambda$appendKmType$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):514:514 -> a
+    481:481:void lambda$appendKmType$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):510:510 -> a
+    482:482:void lambda$appendKmType$39(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):516:516 -> a
+    483:483:void lambda$appendKmType$41(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):523:523 -> a
+    484:484:void lambda$appendKmType$45(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):536:536 -> a
+    485:485:void lambda$appendKmType$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):552:552 -> a
+    486:486:void lambda$appendKmType$43(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):551:551 -> a
+    487:487:void lambda$appendKmType$46(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):568:568 -> a
+    488:488:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):576:576 -> a
+    489:489:void lambda$appendKmTypeProjection$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):586:586 -> a
+    490:490:void lambda$appendValueParameters$51(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):602:602 -> a
+    491:494:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):609:612 -> a
+    495:495:void lambda$appendValueParameter$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):624:624 -> a
+    496:496:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):638:638 -> a
+    497:497:void lambda$appendTypeParameters$55(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):644:644 -> a
+    498:498:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):650:650 -> a
+    499:499:void lambda$appendTypeParameter$57(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):668:668 -> a
+    500:500:void lambda$appendTypeParameter$57(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):664:664 -> a
+    501:501:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):691:691 -> a
+    502:502:void lambda$appendTypeAlias$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):705:705 -> a
+    503:503:void lambda$appendTypeAlias$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):701:701 -> a
+    504:504:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):738:738 -> a
+    505:506:void lambda$appendKmAnnotation$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):743:744 -> a
+    507:509:void lambda$appendKmAnnotation$67(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):749:751 -> a
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> b
-    1:1:void lambda$appendTypeParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):654 -> b
+    1:1:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):682 -> b
     2:30:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:28 -> b
     2:30:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152 -> b
-    2:30:void lambda$appendTypeParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):654 -> b
+    2:30:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):682 -> b
     31:31:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152:152 -> b
-    31:31:void lambda$appendTypeParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):654 -> b
-    32:32:void lambda$appendTypeParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):654:654 -> b
-    33:33:void lambda$appendTypeParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):650:650 -> b
-    34:34:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):163:163 -> b
-    35:38:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):155:158 -> b
-    35:38:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):163 -> b
-    39:39:void lambda$appendKmSection$5(java.util.function.Consumer,java.lang.String):166:166 -> b
-    40:42:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):235:237 -> b
-    43:62:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):236:255 -> b
-    63:63:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):231:231 -> b
-    64:64:void lambda$appendKmDeclarationContainer$13(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):257:257 -> b
-    65:65:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):316:316 -> b
-    66:66:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):312:312 -> b
-    67:76:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):381:390 -> b
-    77:77:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):389:389 -> b
-    78:78:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):411:411 -> b
-    79:79:void lambda$appendKmProperty$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):450:450 -> b
-    80:80:void lambda$appendKmType$42(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):527:527 -> b
-    81:81:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):538:538 -> b
-    82:82:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):534:534 -> b
-    83:91:void lambda$appendKmTypeProjection$47(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):553:561 -> b
-    92:92:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):568:568 -> b
-    93:93:void lambda$appendValueParameter$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):603:603 -> b
-    94:94:void lambda$appendTypeParameter$53(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):642:642 -> b
-    95:95:void lambda$appendTypeAlias$58(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):679:679 -> b
-    96:96:void lambda$appendTypeAlias$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):687:687 -> b
+    31:31:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):682 -> b
+    32:32:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):682:682 -> b
+    33:33:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):678:678 -> b
+    34:34:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):164:164 -> b
+    35:38:void appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):156:159 -> b
+    35:38:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):164 -> b
+    39:39:void lambda$appendKmSection$5(java.util.function.Consumer,java.lang.String):167:167 -> b
+    40:42:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):236:238 -> b
+    43:62:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):237:256 -> b
+    63:63:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):232:232 -> b
+    64:64:void lambda$appendKmDeclarationContainer$13(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):258:258 -> b
+    65:65:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):317:317 -> b
+    66:66:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):313:313 -> b
+    67:76:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):382:391 -> b
+    77:77:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):390:390 -> b
+    78:78:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):412:412 -> b
+    79:79:void lambda$appendKmProperty$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):451:451 -> b
+    80:80:void lambda$appendKmType$42(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):528:528 -> b
+    81:81:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):545:545 -> b
+    82:87:void lambda$appendKmType$44(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):541:546 -> b
+    88:88:void lambda$appendKmType$47(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):566:566 -> b
+    89:89:void lambda$appendKmType$47(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):562:562 -> b
+    90:98:void lambda$appendKmTypeProjection$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):581:589 -> b
+    99:99:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):596:596 -> b
+    100:100:void lambda$appendValueParameter$53(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):631:631 -> b
+    101:101:void lambda$appendTypeParameter$56(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):670:670 -> b
+    102:102:void lambda$appendTypeAlias$61(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):707:707 -> b
+    103:103:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):715:715 -> b
     1:22:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:21 -> c
-    1:22:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):348 -> c
-    23:23:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):348:348 -> c
-    24:24:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):344:344 -> c
-    25:27:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):269:271 -> c
-    28:28:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):265:265 -> c
-    29:29:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):292:292 -> c
-    30:30:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):416:416 -> c
-    31:31:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):455:455 -> c
-    32:59:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):502:529 -> c
-    60:69:void lambda$appendValueParameter$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):589:598 -> c
-    70:88:void lambda$appendTypeParameter$57(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):627:645 -> c
-    89:89:void lambda$appendTypeParameter$55(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):656:656 -> c
-    90:90:void lambda$appendTypeAlias$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):696:696 -> c
-    1:3:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):362:364 -> d
-    4:7:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):363:366 -> d
-    8:8:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):358:358 -> d
-    9:9:void lambda$appendKmFunction$32(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):421:421 -> d
-    10:10:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):462:462 -> d
-    11:11:void lambda$appendTypeAlias$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):703:703 -> d
-    1:25:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):400:424 -> e
-    26:26:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):423:423 -> e
+    1:22:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):349 -> c
+    23:23:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):349:349 -> c
+    24:24:void lambda$appendKmClass$23(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):345:345 -> c
+    25:27:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):270:272 -> c
+    28:28:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):266:266 -> c
+    29:29:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):293:293 -> c
+    30:30:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):417:417 -> c
+    31:31:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):456:456 -> c
+    32:86:void lambda$appendKmType$48(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):503:557 -> c
+    87:96:void lambda$appendValueParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):617:626 -> c
+    97:115:void lambda$appendTypeParameter$60(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):655:673 -> c
+    116:116:void lambda$appendTypeParameter$58(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):684:684 -> c
+    117:117:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):724:724 -> c
+    1:3:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):363:365 -> d
+    4:7:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):364:367 -> d
+    8:8:void lambda$appendKmClass$26(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):359:359 -> d
+    9:9:void lambda$appendKmFunction$32(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):422:422 -> d
+    10:10:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):463:463 -> d
+    11:11:void lambda$appendTypeAlias$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):731:731 -> d
+    1:25:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):401:425 -> e
+    26:26:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):424:424 -> e
     27:27:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:0 -> e
-    27:27:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):429 -> e
+    27:27:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):430 -> e
     28:47:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:19 -> e
     28:47:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79 -> e
-    28:47:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):429 -> e
+    28:47:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):430 -> e
     48:48:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):79:79 -> e
-    48:48:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):429 -> e
-    49:49:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):425:425 -> e
-    50:74:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):439:463 -> e
+    48:48:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):430 -> e
+    49:49:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):426:426 -> e
+    50:74:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):440:464 -> e
     75:163:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:88 -> e
-    75:163:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):463 -> e
-    164:170:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):463:469 -> e
-    171:181:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):465:475 -> e
-    182:192:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):471:481 -> e
-    193:193:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):477:477 -> e
+    75:163:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):464 -> e
+    164:170:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):464:470 -> e
+    171:181:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):466:476 -> e
+    182:192:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):472:482 -> e
+    193:193:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):478:478 -> e
     194:326:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:132 -> e
-    194:326:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):483 -> e
-    327:327:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):488:488 -> e
-    328:328:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484:484 -> e
-    329:359:void lambda$appendTypeAlias$63(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):668:698 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.x.P:
+    194:326:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484 -> e
+    327:327:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):489:489 -> e
+    328:328:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):485:485 -> e
+    329:359:void lambda$appendTypeAlias$66(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):696:726 -> e
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.w.S:
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
     boolean isFunction() -> d
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> g
-    boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.x.Q:
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> h
+    boolean isConstructor() -> l
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.w.T:
     java.util.List partClassNames -> a
-    1:2:void <init>(java.util.List):26:27 -> <init>
-    1:7:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,com.android.tools.r8.graph.AppView):32:38 -> a
-    8:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:57 -> a
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58 -> a
-    11:13:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):59:61 -> a
+    java.lang.String packageName -> b
+    1:3:void <init>(java.util.List,java.lang.String):28:30 -> <init>
+    1:7:com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade,java.lang.String,com.android.tools.r8.graph.DexDefinitionSupplier):37:43 -> a
+    8:13:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:66 -> a
     14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):241:242 -> a
     14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
+    14:15:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69 -> a
     16:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):0:364 -> a
     16:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
     16:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    16:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
+    16:380:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69 -> a
     381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):247:247 -> a
     381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
     381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
+    381:381:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69 -> a
     382:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):245:249 -> a
     382:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
     382:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    382:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
-    387:387:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64:64 -> a
+    382:386:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69 -> a
+    387:387:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:69 -> a
     388:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List,int[],int[],int):364:364 -> a
     388:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer,java.util.List,int[],int[],int,int,java.lang.Object):243 -> a
     388:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer.write(java.util.List):0 -> a
-    388:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64 -> a
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.x.S:
+    388:388:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69 -> a
+    1:1:java.lang.String getPackageName():74:74 -> g
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.w.U:
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
-    1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinPackageInfo):22:24 -> <init>
-    1:1:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):29:29 -> a
+    java.lang.String packageName -> c
+    1:4:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinPackageInfo,java.lang.String):28:31 -> <init>
+    1:1:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:41 -> a
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.getFacadeClassName():271:271 -> a
-    2:2:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):30 -> a
-    3:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):31:31 -> a
-    4:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):47:52 -> a
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.x.T:
+    2:2:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):42 -> a
+    3:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):44:44 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):43:43 -> a
+    5:10:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:66 -> a
+    1:1:java.lang.String getPackageName():71:71 -> g
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.w.V:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     java.lang.String moduleName -> a
-    1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo):27:29 -> <init>
-    1:3:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):33:35 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):42:42 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):35 -> a
-    5:11:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):35:41 -> a
+    1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo):30:32 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:43 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):65:65 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):43 -> a
+    5:11:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):43:49 -> a
     12:70:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:58 -> a
-    12:70:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):42 -> a
-    71:71:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):43:43 -> a
-    72:79:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):51:58 -> a
-    80:140:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):0:60 -> a
-    80:140:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.x.U:
+    12:70:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):50 -> a
+    71:71:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:51 -> a
+    72:76:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):60:60 -> a
+    83:83:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):67:67 -> a
+    84:144:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.setModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,java.lang.String):0:60 -> a
+    84:144:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):67 -> a
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.w.W:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo setterSignature -> l
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> m
     int jvmFlags -> i
@@ -56093,23 +57003,26 @@
     com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo fieldSignature -> j
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> f
     java.lang.String name -> d
-    1:14:void <init>(int,int,int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinValueParameterInfo,java.util.List,int,com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):65:78 -> <init>
-    1:9:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):82:90 -> a
-    10:98:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:88 -> a
-    10:98:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):91 -> a
-    99:101:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):92:94 -> a
-    102:105:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):93:96 -> a
-    106:106:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):95:95 -> a
-    107:239:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:132 -> a
-    107:239:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):98 -> a
-    240:240:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.AppView):97:97 -> a
-    241:262:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):129:150 -> a
-    263:270:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):146:153 -> a
-    271:271:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):152:152 -> a
+    1:14:void <init>(int,int,int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinValueParameterInfo,java.util.List,int,com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo):67:80 -> <init>
+    1:9:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):85:93 -> a
+    10:13:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):92:95 -> a
+    14:14:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):94:94 -> a
+    15:103:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:88 -> a
+    15:103:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):96 -> a
+    104:104:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):98:98 -> a
+    105:108:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):97:100 -> a
+    109:112:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):99:102 -> a
+    113:113:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):101:101 -> a
+    114:246:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:132 -> a
+    114:246:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):104 -> a
+    247:247:com.android.tools.r8.kotlin.KotlinPropertyInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):103:103 -> a
+    248:269:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):135:156 -> a
+    270:277:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):152:159 -> a
+    278:278:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):158:158 -> a
     com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> b
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> g
-    boolean isFieldProperty() -> j
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.x.V:
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> h
+    boolean isFieldProperty() -> k
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.w.X:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
@@ -56123,31 +57036,31 @@
     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
+    81:81:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):132:132 -> a
+    82:82:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148:148 -> a
+    83:97:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):178:192 -> a
+    83:97:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    98:98:int asInteger(java.lang.String):205:205 -> a
+    98:98:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
+    98:98:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    99:102:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):193:196 -> a
+    99:102:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    103:103:int asInteger(java.lang.String):207:207 -> a
+    103:103:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):192 -> a
+    103:103:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    104:104:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):189:189 -> a
+    104:104:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    105:105:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):185:185 -> a
+    105:105:void lambda$parse$0(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):148 -> a
+    106:106:void addFileToBuilder(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):180:180 -> a
+    106:106: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.x.V$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.x.V$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.w.X$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.w.X$b:
     java.io.BufferedReader reader -> a
     java.lang.String readLine -> b
     boolean $assertionsDisabled -> c
@@ -56161,25 +57074,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:72 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.x.V$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.w.X$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.x.V$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.w.X$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
     1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.x.V$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.w.X$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.x.V$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.w.X$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.x.V$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.w.X$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
@@ -56187,29 +57100,37 @@
     1:1:java.lang.String getFileName():287:287 -> a
     1:1:java.lang.String getPath():291:291 -> b
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.x.W:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.w.Z:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
-    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.kotlin.KotlinLambdaInfo,com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour):31:33 -> <init>
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> c
+    java.lang.String packageName -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.kotlin.KotlinLambdaInfo,com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour,java.lang.String):33:36 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
-    1:10:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):39:48 -> a
-    11:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):93:103 -> a
-    11:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):49 -> a
-    22:22:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):49:49 -> a
-    23:23:boolean isJavaStyleLambda():61:61 -> a
-    24:27:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):77:80 -> a
+    1:7:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):47:53 -> a
+    8:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):105:118 -> a
+    8:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):55 -> a
+    22:22:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):55:55 -> a
+    23:23:boolean isJavaStyleLambda():68:68 -> a
+    24:27:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):84:87 -> a
     28:267:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:239 -> a
-    28:267:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):81 -> a
+    28:267:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):88 -> a
     268:268:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):238:238 -> a
-    268:268:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):81 -> a
-    269:269:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):84:84 -> a
-    1:1:boolean isKotlinStyleLambda():57:57 -> b
-    1:1:boolean isLambda():53:53 -> c
-    boolean isSyntheticClass() -> h
-    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> i
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.x.X:
+    268:268:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):88 -> a
+    269:269:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):91:91 -> a
+    1:1:boolean isKotlinStyleLambda():64:64 -> b
+    1:1:boolean isLambda():60:60 -> c
+    1:1:java.lang.String getPackageName():96:96 -> g
+    boolean isSyntheticClass() -> i
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> j
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.w.Y:
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour Unclassified -> c
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour JavaStyleLambda -> b
+    com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour KotlinStyleLambda -> a
+    1:3:void <clinit>():26:28 -> <clinit>
+    1:1:void <init>(java.lang.String,int):25:25 -> <init>
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.w.a0:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -56217,34 +57138,28 @@
     boolean $assertionsDisabled -> g
     java.lang.String name -> b
     int flags -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:9:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):30:38 -> <init>
-    1:7:com.android.tools.r8.kotlin.KotlinTypeAliasInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,com.android.tools.r8.graph.AppView):42:48 -> a
-    8:15:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:62 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.x.Y:
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:9:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):32:40 -> <init>
+    1:7:com.android.tools.r8.kotlin.KotlinTypeAliasInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):45:51 -> a
+    8:15:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):58:65 -> a
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.w.b0:
+    com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBoundInfo -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
     java.util.List arguments -> e
     com.android.tools.r8.kotlin.KotlinClassifierInfo classifier -> b
     com.android.tools.r8.kotlin.KotlinTypeInfo abbreviatedType -> c
-    java.util.List EMPTY_ARGUMENTS -> g
+    java.util.List EMPTY_ARGUMENTS -> h
     int flags -> a
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:7:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List):37:43 -> <init>
-    1:2:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):54:55 -> a
-    3:26:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.AppView):22:45 -> a
-    3:26:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):56 -> a
-    27:28:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
-    27:28:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.AppView):45 -> a
-    27:28:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):56 -> a
-    29:30:com.android.tools.r8.kotlin.KotlinClassifierInfo com.android.tools.r8.kotlin.KotlinClassifierInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.AppView):45:46 -> a
-    29:30:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):56 -> a
-    31:33:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):57:59 -> a
-    34:41:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.AppView):65:72 -> a
-    34:41:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):59 -> a
-    42:42:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.AppView):60:60 -> a
-    43:62:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):80:99 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.x.Z:
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:8:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo):40:47 -> <init>
+    1:9:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):55:63 -> a
+    10:10:com.android.tools.r8.kotlin.KotlinTypeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):62:62 -> a
+    11:18:java.util.List getArguments(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):70:77 -> a
+    19:29:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):85:95 -> a
+    30:34:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):94:98 -> a
+    35:44:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):97:106 -> a
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.w.c0:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     java.util.List EMPTY_UPPER_BOUNDS -> h
@@ -56253,49 +57168,51 @@
     int id -> b
     java.lang.String name -> c
     int flags -> a
-    1:2:void <clinit>():22:23 -> <clinit>
-    1:7:void <init>(int,int,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,java.util.List,java.util.List):38:44 -> <init>
-    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):60:64 -> a
-    6:11:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):49:54 -> a
-    6:11:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
-    12:19:java.util.List getUpperBounds(java.util.List,com.android.tools.r8.graph.AppView):71:78 -> a
-    12:19:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):54 -> a
-    12:19:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
+    1:2:void <clinit>():24:25 -> <clinit>
+    1:7:void <init>(int,int,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,java.util.List,java.util.List):40:46 -> <init>
+    1:5:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):67:71 -> a
+    6:11:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):53:58 -> a
+    6:11:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
+    12:19:java.util.List getUpperBounds(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):79:86 -> a
+    12:19:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):58 -> a
+    12:19:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
     20:20:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> a
-    20:20:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):55 -> a
-    20:20:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
+    20:20:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):60 -> a
+    20:20:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
     21:49:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:28 -> a
     21:49:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152 -> a
-    21:49:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):55 -> a
-    21:49:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
+    21:49:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):60 -> a
+    21:49:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
     50:50:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):152:152 -> a
-    50:50:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):55 -> a
-    50:50:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
-    51:51:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.AppView):55:55 -> a
-    51:51:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65 -> a
-    52:54:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):65:67 -> a
-    55:66:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):85:96 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.x.a0:
+    50:50:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):60 -> a
+    50:50:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
+    51:51:com.android.tools.r8.kotlin.KotlinTypeParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):59:59 -> a
+    51:51:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72 -> a
+    52:54:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):72:74 -> a
+    55:66:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):93:104 -> a
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.w.d0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
-    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):19:21 -> <init>
-    1:2:com.android.tools.r8.kotlin.KotlinTypeProjectionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,com.android.tools.r8.graph.AppView):25:26 -> a
-    3:3:boolean isStarProjection():30:30 -> a
-    3:3:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):38 -> a
-    4:6:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):39:41 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):41:41 -> a
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.x.b0:
+    1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):21:23 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinTypeProjectionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):30:32 -> a
+    4:4:boolean isStarProjection():36:36 -> a
+    4:4:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44 -> a
+    5:7:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):45:47 -> a
+    8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):47:47 -> a
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.w.e0:
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
     java.lang.String name -> a
     int flags -> b
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:5:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo):29:33 -> <init>
-    1:6:com.android.tools.r8.kotlin.KotlinValueParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,com.android.tools.r8.graph.AppView):40:45 -> a
-    7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.AppView):50:57 -> a
-    15:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):64:67 -> a
-com.android.tools.r8.logging.Log -> com.android.tools.r8.y.a:
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:5:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo):31:35 -> <init>
+    1:7:com.android.tools.r8.kotlin.KotlinValueParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):45:51 -> a
+    8:8:com.android.tools.r8.kotlin.KotlinValueParameterInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):50:50 -> a
+    9:16:java.util.List create(java.util.List,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter):58:65 -> a
+    17:21:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):72:76 -> a
+    22:22:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):75:75 -> a
+com.android.tools.r8.logging.Log -> com.android.tools.r8.x.a:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -56328,45 +57245,44 @@
     10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromInputStream(java.io.InputStream):70:70 -> a
     10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):86 -> a
     11:16:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):95:95 -> a
-    20:20:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader):99:99 -> a
-    21:24:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):133:136 -> a
+    17:20:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):133:136 -> a
+    21:21:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
+    21:21:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):136 -> a
+    22:24:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):136:138 -> a
     25:25:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
-    25:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):136 -> a
-    26:28:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):136:138 -> a
-    29:29:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
-    29:29:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):138 -> a
-    30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):140:140 -> a
-    31:35:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):124:128 -> a
-    31:35:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):142 -> a
-    36:36:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):142:142 -> a
-    37:37:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):146:146 -> a
-    38:38:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
-    38:38:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):146 -> a
-    39:39:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147:147 -> a
-    40:44:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):124:128 -> a
-    40:44:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147 -> a
-    45:45:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147:147 -> a
-    46:50:java.lang.String deobfuscateClassName(java.lang.String):157:161 -> a
-    51:51:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):190:190 -> a
-    52:52:void write(com.android.tools.r8.utils.ChainableStringConsumer):212:212 -> a
+    25:25:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):138 -> a
+    26:26:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):140:140 -> a
+    27:31:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):124:128 -> a
+    27:31:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):142 -> a
+    32:32:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):142:142 -> a
+    33:33:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):146:146 -> a
+    34:34:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
+    34:34:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):146 -> a
+    35:35:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147:147 -> a
+    36:40:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):124:128 -> a
+    36:40:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147 -> a
+    41:41:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):147:147 -> a
+    42:46:java.lang.String deobfuscateClassName(java.lang.String):157:161 -> a
+    47:47:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):190:190 -> a
+    48:48:void write(com.android.tools.r8.utils.ChainableStringConsumer):212:212 -> a
+    49:49:java.util.Map getClassNameMappings():120:120 -> a
+    49:49:boolean verifyIsSorted():197 -> a
+    49:49:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
+    50:52:boolean verifyIsSorted():197:199 -> a
+    50:52:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
     53:53:java.util.Map getClassNameMappings():120:120 -> a
-    53:53:boolean verifyIsSorted():197 -> a
+    53:53:boolean verifyIsSorted():199 -> a
     53:53:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
-    54:56:boolean verifyIsSorted():197:199 -> a
-    54:56:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
-    57:57:java.util.Map getClassNameMappings():120:120 -> a
-    57:57:boolean verifyIsSorted():199 -> a
-    57:57:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
-    58:63:boolean verifyIsSorted():199:204 -> a
-    58:63:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
-    64:64:java.util.Map getClassNameMappings():120:120 -> a
-    64:64:void write(com.android.tools.r8.utils.ChainableStringConsumer):213 -> a
-    65:66:void write(com.android.tools.r8.utils.ChainableStringConsumer):213:214 -> a
-    67:74:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):249:256 -> a
-    75:84:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):261:270 -> a
-    85:85:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):302:302 -> a
-    86:86:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
-    86:86:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):302 -> a
+    54:59:boolean verifyIsSorted():199:204 -> a
+    54:59:void write(com.android.tools.r8.utils.ChainableStringConsumer):212 -> a
+    60:60:java.util.Map getClassNameMappings():120:120 -> a
+    60:60:void write(com.android.tools.r8.utils.ChainableStringConsumer):213 -> a
+    61:62:void write(com.android.tools.r8.utils.ChainableStringConsumer):213:214 -> a
+    63:70:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):249:256 -> a
+    71:80:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):261:270 -> a
+    81:81:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):302:302 -> a
+    82:82:java.lang.String deobfuscateType(java.lang.String):165:165 -> a
+    82:82:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):302 -> a
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):181:181 -> b
     2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():226:226 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap.builder():122:122 -> b
@@ -56415,66 +57331,61 @@
     boolean isAccessModificationAllowed -> f
     java.util.Map renaming -> j
     java.util.Map states -> k
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):64:64 -> <init>
-    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):49:86 -> <init>
-    1:1:java.util.function.Predicate access$100(com.android.tools.r8.naming.ClassNameMinifier):41:41 -> a
-    2:2:void setUsedTypeName(java.lang.String):91:91 -> a
-    2:2:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):41 -> a
-    3:30:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):114:141 -> a
-    31:58:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):137:164 -> a
-    59:67:java.util.Map getPackageRenaming():168:176 -> a
-    59:67:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):164 -> a
-    68:68:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):164:164 -> a
-    69:69:java.util.Iterator lambda$computeRenaming$1():156:156 -> a
-    70:71:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):180:181 -> a
-    72:72:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):185:185 -> a
-    73:76:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):189:192 -> a
-    77:79:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):208:210 -> a
-    80:86:void registerPackagePrefixesAsUsed(java.lang.String):231:237 -> a
-    80:86:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):209 -> a
-    87:87:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):211:211 -> a
-    88:88:void setUsedTypeName(java.lang.String):91:91 -> a
-    88:88:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):211 -> a
-    89:96:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):212:219 -> a
-    97:103:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):260:266 -> a
-    104:104:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    104:104:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):266 -> a
-    105:113:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):267:275 -> a
-    114:127:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):340:353 -> a
-    114:127:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):277 -> a
-    128:132:void com.android.tools.r8.kotlin.KotlinMetadataRewriter.removeKotlinMetadataFromRenamedClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):47:51 -> a
-    128:132:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):353 -> a
-    128:132:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):277 -> a
-    133:135:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):355:357 -> a
-    133:135:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):277 -> a
-    136:138:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):281:283 -> a
-    139:143:java.lang.String getParentPackagePrefix(java.lang.String):462:466 -> a
-    1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$200(com.android.tools.r8.naming.ClassNameMinifier):41:41 -> b
-    2:2:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):242:242 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    3:3:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):242 -> b
-    4:8:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):251:255 -> b
-    9:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):317:334 -> b
-    1:1:java.util.Set access$300(com.android.tools.r8.naming.ClassNameMinifier):41:41 -> c
-    2:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):287:307 -> c
-    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):303:303 -> c
-    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):299:299 -> c
-    25:25:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):293:293 -> c
-    26:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$2(java.lang.String):293:293 -> c
-    1:1:java.util.Set access$500(com.android.tools.r8.naming.ClassNameMinifier):41:41 -> d
-    2:3:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$3(java.lang.String):308:309 -> d
-    4:8:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):363:367 -> d
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):63:63 -> <init>
+    2:39:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy,com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy,java.lang.Iterable):48:85 -> <init>
+    1:1:java.util.function.Predicate access$100(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> a
+    2:2:void setUsedTypeName(java.lang.String):90:90 -> a
+    2:2:void access$400(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):40 -> a
+    3:27:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):113:137 -> a
+    28:55:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):133:160 -> a
+    56:64:java.util.Map getPackageRenaming():164:172 -> a
+    56:64:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):160 -> a
+    65:65:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService,java.util.Map):160:160 -> a
+    66:66:java.util.Iterator lambda$computeRenaming$1():152:152 -> a
+    67:68:void renameDanglingTypes(com.android.tools.r8.graph.DexClass):176:177 -> a
+    69:69:void renameDanglingTypesInField(com.android.tools.r8.graph.DexEncodedField):181:181 -> a
+    70:73:void renameDanglingTypesInMethod(com.android.tools.r8.graph.DexEncodedMethod):185:188 -> a
+    74:76:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):204:206 -> a
+    77:83:void registerPackagePrefixesAsUsed(java.lang.String):227:233 -> a
+    77:83:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):205 -> a
+    84:84:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):207:207 -> a
+    85:85:void setUsedTypeName(java.lang.String):90:90 -> a
+    85:85:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):207 -> a
+    86:93:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):208:215 -> a
+    94:100:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):256:262 -> a
+    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    101:101:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):262 -> a
+    102:110:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):263:271 -> a
+    111:127:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):336:352 -> a
+    111:127:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):273 -> a
+    128:130:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):277:279 -> a
+    131:135:java.lang.String getParentPackagePrefix(java.lang.String):457:461 -> a
+    1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$200(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> b
+    2:2:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):238:238 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    3:3:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):238 -> b
+    4:8:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):247:251 -> b
+    9:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):313:330 -> b
+    1:1:java.util.Set access$300(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> c
+    2:22:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):283:303 -> c
+    23:23:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):299:299 -> c
+    24:24:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):295:295 -> c
+    25:25:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForClass(com.android.tools.r8.graph.DexType):289:289 -> c
+    26:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$2(java.lang.String):289:289 -> c
+    1:1:java.util.Set access$500(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> d
+    2:3:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$3(java.lang.String):304:305 -> d
+    4:8:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):358:362 -> d
     9:9:int com.android.tools.r8.graph.DexString.numberOfLeadingSquareBrackets():108:108 -> d
-    9:9:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):367 -> d
-    10:16:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):368:374 -> d
-    1:1:com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy access$600(com.android.tools.r8.naming.ClassNameMinifier):41:41 -> e
-    2:6:void renameDanglingType(com.android.tools.r8.graph.DexType):197:201 -> e
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> e
-    7:7:void renameDanglingType(com.android.tools.r8.graph.DexType):201 -> e
-    8:10:void renameDanglingType(com.android.tools.r8.graph.DexType):201:203 -> e
-    11:11:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$4(java.lang.String):324:324 -> e
-    1:1:boolean lambda$new$0(java.lang.String):83:83 -> f
+    9:9:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):362 -> d
+    10:16:void renameArrayTypeIfNeeded(com.android.tools.r8.graph.DexType):363:369 -> d
+    1:1:com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy access$600(com.android.tools.r8.naming.ClassNameMinifier):40:40 -> e
+    2:6:void renameDanglingType(com.android.tools.r8.graph.DexType):193:197 -> e
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> e
+    7:7:void renameDanglingType(com.android.tools.r8.graph.DexType):197 -> e
+    8:10:void renameDanglingType(com.android.tools.r8.graph.DexType):197:199 -> e
+    11:11:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$4(java.lang.String):320:320 -> e
+    1:1:boolean lambda$new$0(java.lang.String):82:82 -> f
 com.android.tools.r8.naming.ClassNameMinifier$1 -> com.android.tools.r8.naming.c$a:
 com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy -> com.android.tools.r8.naming.c$b:
     boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType) -> a
@@ -56483,8 +57394,8 @@
 com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming -> com.android.tools.r8.naming.c$c:
     java.util.Map packageRenaming -> a
     java.util.Map classRenaming -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):94:94 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):99:101 -> <init>
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.ClassNameMinifier$1):93:93 -> <init>
+    2:4:void <init>(java.util.Map,java.util.Map):98:100 -> <init>
 com.android.tools.r8.naming.ClassNameMinifier$Namespace -> com.android.tools.r8.naming.c$d:
     char[] packagePrefix -> b
     com.android.tools.r8.naming.ClassNameMinifier this$0 -> e
@@ -56492,19 +57403,19 @@
     java.lang.String packageName -> a
     int nameIndex -> d
     int dictionaryIndex -> c
-    1:1:void <clinit>():379:379 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):387:387 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):390:390 -> <init>
-    3:15:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):383:395 -> <init>
-    1:3:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):403:405 -> a
-    4:4:int incrementDictionaryIndex():423:423 -> a
-    5:6:int incrementNameIndex(boolean):428:429 -> a
-    1:1:int getDictionaryIndex():418:418 -> b
-    1:1:java.lang.String getPackageName():399:399 -> c
-    1:1:java.lang.String nextPackagePrefix():410:410 -> d
+    1:1:void <clinit>():374:374 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String):382:382 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):385:385 -> <init>
+    3:15:void <init>(com.android.tools.r8.naming.ClassNameMinifier,java.lang.String,java.lang.String):378:390 -> <init>
+    1:3:com.android.tools.r8.graph.DexString nextTypeName(com.android.tools.r8.graph.DexType):398:400 -> a
+    4:4:int incrementDictionaryIndex():418:418 -> a
+    5:6:int incrementNameIndex(boolean):423:424 -> a
+    1:1:int getDictionaryIndex():413:413 -> b
+    1:1:java.lang.String getPackageName():394:394 -> c
+    1:1:java.lang.String nextPackagePrefix():405:405 -> d
     2:3:java.lang.String com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy.next(char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):206:207 -> d
-    2:3:java.lang.String nextPackagePrefix():410 -> d
-    4:5:java.lang.String nextPackagePrefix():411:412 -> d
+    2:3:java.lang.String nextPackagePrefix():405 -> d
+    4:5:java.lang.String nextPackagePrefix():406:407 -> d
 com.android.tools.r8.naming.ClassNameMinifier$PackageNamingStrategy -> com.android.tools.r8.naming.c$e:
 com.android.tools.r8.naming.ClassNaming -> com.android.tools.r8.naming.d:
     com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature) -> a
@@ -56668,14 +57579,14 @@
     30:30:void renameFieldsInInterfacePartition(java.util.Set):217:217 -> a
     30:30:void renameFieldsInInterfaces(java.util.Collection):194 -> a
     30:30:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):58 -> a
-    31:31:void com.android.tools.r8.naming.ReservedFieldNamingState.markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):30:30 -> a
+    31:31:void com.android.tools.r8.naming.ReservedFieldNamingState.markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType) -> a
     31:31:void renameFieldsInInterfacePartition(java.util.Set):217 -> a
     31:31:void renameFieldsInInterfaces(java.util.Collection):194 -> a
     31:31:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):58 -> a
     32:39:void renameFieldsInInterfacePartition(java.util.Set):223:230 -> a
     32:39:void renameFieldsInInterfaces(java.util.Collection):194 -> a
     32:39:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):58 -> a
-    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     40:40:void renameFieldsInInterfacePartition(java.util.Set):230 -> a
     40:40:void renameFieldsInInterfaces(java.util.Collection):194 -> a
     40:40:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):58 -> a
@@ -56685,10 +57596,10 @@
     43:50:com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):59:66 -> a
     51:51:com.android.tools.r8.naming.ReservedFieldNamingState getOrCreateReservedFieldNamingState(com.android.tools.r8.graph.DexType):87:87 -> a
     52:58:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):98:104 -> a
-    59:59:void com.android.tools.r8.naming.ReservedFieldNamingState.markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):30:30 -> a
+    59:59:void com.android.tools.r8.naming.ReservedFieldNamingState.markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):31:31 -> a
     59:59:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):104 -> a
     60:70:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):107:117 -> a
-    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     71:71:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):117 -> a
     72:74:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):119:121 -> a
     75:78:void lambda$reserveFieldNames$2(com.android.tools.r8.graph.DexClasspathClass):132:135 -> a
@@ -56700,14 +57611,14 @@
     85:86:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):150:151 -> a
     87:87:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
     87:87:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):151 -> a
-    88:88:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    88:88:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     88:88:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):291 -> a
     88:88:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):151 -> a
     89:89:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):292:292 -> a
     89:89:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):151 -> a
     90:91:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):152:153 -> a
     92:96:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):167:171 -> a
-    97:97:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> a
+    97:97:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):27:27 -> a
     97:97:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):171 -> a
     98:98:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):175:175 -> a
     99:107:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):173:181 -> a
@@ -56716,10 +57627,10 @@
     112:113:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):186:187 -> a
     114:114:void renameNonReboundAccessesToField(com.android.tools.r8.graph.FieldAccessInfo):255:255 -> a
     115:118:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):260:263 -> a
-    119:119:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
+    119:119:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
     119:119:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):263 -> a
     120:124:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):265:269 -> a
-    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     125:125:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):269 -> a
     126:140:void renameNonReboundAccessToField(com.android.tools.r8.graph.DexField):271:285 -> a
     1:1:com.android.tools.r8.graph.SubtypingInfo access$300(com.android.tools.r8.naming.FieldNameMinifier):31:31 -> b
@@ -56727,7 +57638,7 @@
     3:7:void renameFieldsInClasses():161:165 -> b
     8:8:void renameFieldsInClasses():164:164 -> b
     1:1:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$4(com.android.tools.r8.graph.DexType):174:174 -> c
-    2:2:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):26:26 -> c
+    2:2:void com.android.tools.r8.naming.FieldNamingState.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):27:27 -> c
     2:2:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$4(com.android.tools.r8.graph.DexType):174 -> c
     3:5:void renameNonReboundReferences():249:251 -> c
     1:48:void reserveFieldNames():93:140 -> d
@@ -56748,7 +57659,7 @@
     1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):289:289 -> a
     2:9:java.util.List sortedPartitions(java.util.Collection):301:308 -> a
     10:18:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):315:323 -> a
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     19:19:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):323 -> a
     20:40:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):328:348 -> a
     41:41:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):315:315 -> a
@@ -56756,29 +57667,29 @@
     com.android.tools.r8.naming.ReservedFieldNamingState reservedNames -> c
     com.android.tools.r8.naming.MemberNamingStrategy strategy -> d
     java.util.function.BiPredicate isAvailable -> e
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):31:31 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):39:42 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState):34:34 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy,com.android.tools.r8.naming.ReservedFieldNamingState,java.util.Map):42:45 -> <init>
     1:1:java.util.function.BiPredicate access$000(com.android.tools.r8.naming.FieldNamingState):19:19 -> a
-    2:2:boolean lambda$new$0(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField):42:42 -> a
-    3:5:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):46:48 -> a
-    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):216:216 -> 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
-    14:14:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):65 -> a
-    15:15:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):65:65 -> a
-    16:17:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.DexField):101:102 -> a
-    16:17:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):65 -> a
-    18:18:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():74:74 -> a
+    2:2:boolean lambda$new$0(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexField):45:45 -> a
+    3:5:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):49:51 -> a
+    6:6:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):72:72 -> a
+    6:6:com.android.tools.r8.naming.FieldNamingState createChildState(com.android.tools.r8.naming.ReservedFieldNamingState):51 -> a
+    7:9:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):56:58 -> a
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    10:10:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):58 -> a
+    11:13:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):60:62 -> a
+    14:14:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getOrCreateInternalState(com.android.tools.r8.graph.DexField):31:31 -> a
+    14:14:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):68 -> a
+    15:15:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):68:68 -> a
+    16:17:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.FieldNamingState$InternalState.createNewName(com.android.tools.r8.graph.DexField):104:105 -> a
+    16:17:com.android.tools.r8.graph.DexString getOrCreateNameFor(com.android.tools.r8.graph.DexField):68 -> a
+    18:18:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():77:77 -> a
     18:18:java.lang.Object createInternalState():19 -> a
-    19:19:void com.android.tools.r8.naming.FieldNamingState$InternalState.<init>(com.android.tools.r8.naming.FieldNamingState):92:92 -> a
-    19:19:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():74 -> a
+    19:19:void com.android.tools.r8.naming.FieldNamingState$InternalState.<init>(com.android.tools.r8.naming.FieldNamingState):95:95 -> a
+    19:19:com.android.tools.r8.naming.FieldNamingState$InternalState createInternalState():77 -> a
     19:19:java.lang.Object createInternalState():19 -> a
     1:1:com.android.tools.r8.naming.MemberNamingStrategy access$100(com.android.tools.r8.naming.FieldNamingState):19:19 -> b
-    2:6:com.android.tools.r8.naming.FieldNamingState clone():79:83 -> b
+    2:6:com.android.tools.r8.naming.FieldNamingState clone():82:86 -> b
     1:1:com.android.tools.r8.naming.ReservedFieldNamingState access$200(com.android.tools.r8.naming.FieldNamingState):19:19 -> c
     1:1:java.lang.Object clone():19:19 -> clone
 com.android.tools.r8.naming.FieldNamingState$InternalState -> com.android.tools.r8.naming.l$a:
@@ -56786,23 +57697,23 @@
     int nextNameIndex -> b
     boolean $assertionsDisabled -> d
     int dictionaryIndex -> a
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.naming.FieldNamingState,int,int):95:97 -> <init>
-    1:1:int incrementDictionaryIndex():118:118 -> a
-    2:3:int incrementNameIndex(boolean):123:124 -> a
-    1:1:int getDictionaryIndex():113:113 -> b
-    1:1:com.android.tools.r8.naming.FieldNamingState$InternalState clone():108:108 -> c
-    1:1:com.android.tools.r8.naming.FieldNamingState$InternalState clone():108:108 -> clone
-    1:1:java.lang.Object clone():86 -> clone
+    1:1:void <clinit>():89:89 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.naming.FieldNamingState,int,int):98:100 -> <init>
+    1:1:int incrementDictionaryIndex():121:121 -> a
+    2:3:int incrementNameIndex(boolean):126:127 -> a
+    1:1:int getDictionaryIndex():116:116 -> b
+    1:1:com.android.tools.r8.naming.FieldNamingState$InternalState clone():111:111 -> c
+    1:1:com.android.tools.r8.naming.FieldNamingState$InternalState clone():111:111 -> clone
+    1:1:java.lang.Object clone():89 -> clone
 com.android.tools.r8.naming.FieldNamingStateBase -> com.android.tools.r8.naming.m:
     java.util.Map internalStates -> b
     com.android.tools.r8.graph.AppView appView -> a
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):18:20 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):20:22 -> <init>
     java.lang.Object createInternalState() -> a
-    1:4:com.android.tools.r8.graph.DexType getInternalStateKey(com.android.tools.r8.graph.DexType):38:41 -> a
-    1:4:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):33 -> a
-    5:5:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):34:34 -> a
-    1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexType):34:34 -> b
+    1:4:com.android.tools.r8.graph.DexType getInternalStateKey(com.android.tools.r8.graph.DexType):40:43 -> a
+    1:4:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):35 -> a
+    5:5:java.lang.Object getOrCreateInternalState(com.android.tools.r8.graph.DexType):36:36 -> a
+    1:1:java.lang.Object lambda$getOrCreateInternalState$0(com.android.tools.r8.graph.DexType):36:36 -> b
 com.android.tools.r8.naming.IdentifierMinifier -> com.android.tools.r8.naming.n:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> c
@@ -56867,14 +57778,14 @@
     418:418:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):350:350 -> a
     418:418:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
     419:444:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    445:445:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    445:445:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296:296 -> a
     445:445:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
     446:446:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    446:446:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):297 -> a
+    446:446:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):296 -> a
     446:446:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
     447:526:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:324 -> a
     527:533:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):323:329 -> a
-    534:534: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
+    534:534: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):67:67 -> a
     534:534:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328 -> a
     535:535:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327:327 -> a
     536:536:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):325:325 -> a
@@ -56891,7 +57802,7 @@
     124:133:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):310:319 -> a
     124:133:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):217 -> a
     134:154:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):224:244 -> a
-    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     155:155:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):244 -> a
     156:171:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):248:263 -> 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):523:561 -> a
@@ -56958,7 +57869,7 @@
     250:256:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):599:605 -> a
     257:257:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):424:424 -> a
     258:285:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):446:473 -> a
-    286:286:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    286:286:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     286:286:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):473 -> a
     287:297:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):474:484 -> a
     298:311:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):483:496 -> a
@@ -57039,7 +57950,7 @@
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):109:109 -> <init>
     2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):105:110 -> <init>
     1:2:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):116:117 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):117 -> a
     4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):119:119 -> 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):114:114 -> a
@@ -57097,7 +58008,7 @@
     6:10:com.android.tools.r8.graph.DexField toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):191:191 -> a
     11:11:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):199:199 -> a
     12:14:void write(java.io.Writer):231:233 -> a
-    com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind() -> c
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():204:204 -> c
     1:5:boolean equals(java.lang.Object):212:216 -> equals
     1:1:int hashCode():221:221 -> hashCode
     1:1:java.lang.String toString():226:226 -> toString
@@ -57116,7 +58027,7 @@
     30:30:com.android.tools.r8.naming.MemberNaming$MethodSignature initializer(java.lang.String[]):312:312 -> a
     31:31:com.android.tools.r8.naming.MemberNaming$Signature asRenamed(java.lang.String):317:317 -> a
     32:42:void write(java.io.Writer):354:364 -> a
-    com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind() -> c
+    1:1:com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind kind():322:322 -> c
     1:8:boolean equals(java.lang.Object):330:337 -> equals
     1:8:java.lang.String toDescriptor():368:375 -> f
     1:2:com.android.tools.r8.naming.MemberNaming$MethodSignature toUnqualified():295:296 -> g
@@ -57135,6 +58046,11 @@
     1:2:java.lang.String toHolderFromQualified():133:134 -> d
     1:2:java.lang.String toUnqualifiedName():128:129 -> e
     1:6:java.lang.String toString():156:161 -> toString
+com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind -> com.android.tools.r8.naming.u$c$a:
+    com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind FIELD -> b
+    com.android.tools.r8.naming.MemberNaming$Signature$SignatureKind METHOD -> a
+    1:2:void <clinit>():166:167 -> <clinit>
+    1:1:void <init>(java.lang.String,int):165:165 -> <init>
 com.android.tools.r8.naming.MemberNamingStrategy -> com.android.tools.r8.naming.v:
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass) -> a
@@ -57161,7 +58077,7 @@
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):86:86 -> a
     3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):86:86 -> a
     4:4:java.util.function.Function getNamingKeyTransform():160:160 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
     5:5:java.util.function.Function getNamingKeyTransform():160 -> a
     6:7:java.util.function.Function getNamingKeyTransform():161:162 -> a
     8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):184:184 -> a
@@ -57169,7 +58085,7 @@
     9:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):185 -> a
     13:29:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):186:202 -> a
     30:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):206:212 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     37:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):212 -> a
     38:39:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213:214 -> a
     40:53:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):225:238 -> a
@@ -57177,7 +58093,7 @@
     54:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):218:219 -> a
     56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):211:211 -> a
     57:66:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):269:278 -> a
-    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     67:67:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):278 -> a
     68:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):280:280 -> a
     69:69:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):334:334 -> a
@@ -57185,7 +58101,7 @@
     70:73:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):280:283 -> a
     74:74:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):276:276 -> a
     75:81:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):292:298 -> a
-    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
+    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
     82:82:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):298 -> a
     83:85:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):300:302 -> a
     86:96:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):316:326 -> a
@@ -57193,12 +58109,12 @@
     97:99:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):308:310 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> b
     2:3:java.util.function.Function getReservationKeyTransform():149:150 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> b
     4:4:java.util.function.Function getReservationKeyTransform():150 -> b
     5:8:java.util.function.Function getReservationKeyTransform():152:155 -> b
     9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):152:152 -> b
     10:18:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):250:258 -> b
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
     19:19:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):258 -> b
     20:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):259:262 -> b
     24:24:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):260:260 -> b
@@ -57324,7 +58240,7 @@
     1:1:void <clinit>():39:39 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):43:44 -> <init>
     1:14:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48:61 -> a
-    15:15:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):107:107 -> a
+    15:15:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):106:106 -> a
     15:15:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62 -> a
     16:47:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:94 -> a
     48:48:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):51:51 -> a
@@ -57360,7 +58276,7 @@
     1:1:void <clinit>():212:212 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):220:223 -> <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):231:232 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> 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):232 -> 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):233:233 -> a
     5:5:com.android.tools.r8.graph.DexString getNextName(com.android.tools.r8.naming.InternalNamingState,boolean):255:255 -> a
@@ -57375,7 +58291,7 @@
     22:23:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):277:278 -> a
     24:24:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):285:285 -> a
     1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):289:289 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
     2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):289 -> c
     3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):290:290 -> c
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.H:
@@ -57467,149 +58383,149 @@
     java.util.Map memberNames -> f
     java.util.Map syntheticCompanionClasses -> g
     java.util.Map defaultInterfaceMethodImplementationNames -> h
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):84:84 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):74:87 -> <init>
-    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):76:76 -> a
-    2:27:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):91:116 -> a
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):75:88 -> <init>
+    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):77:77 -> a
+    2:27:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92:117 -> a
     28:28:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    28:28:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):116 -> a
-    29:32:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:127 -> a
-    33:44:void computeDefaultInterfaceMethodMethods():339:350 -> a
-    33:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    45:807:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:762 -> a
-    45:807:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
-    45:807:void computeDefaultInterfaceMethodMethods():350 -> a
-    45:807:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    808:809:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:370 -> a
-    808:809:void computeDefaultInterfaceMethodMethods():350 -> a
-    808:809:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    810:810:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    810:810:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):370 -> a
-    810:810:void computeDefaultInterfaceMethodMethods():350 -> a
-    810:810:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    811:826:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):371:386 -> a
-    811:826:void computeDefaultInterfaceMethodMethods():350 -> a
-    811:826:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    827:831:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):385:389 -> a
-    827:831:void computeDefaultInterfaceMethodMethods():350 -> a
-    827:831:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    832:832:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):388:388 -> a
-    832:832:void computeDefaultInterfaceMethodMethods():350 -> a
-    832:832:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    833:883:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:179 -> a
-    884:889:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):101:106 -> a
-    890:890:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119:119 -> a
-    891:891:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    891:891:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
-    892:893:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:121 -> a
-    894:895:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:190 -> a
-    896:896:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    896:896:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):190 -> a
-    897:906:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):193:202 -> a
-    907:914:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:332 -> a
-    907:914:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):202 -> a
-    915:915:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):331:331 -> a
-    915:915:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):202 -> a
-    916:920:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):330:334 -> a
-    916:920:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):202 -> a
-    921:931:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:214 -> a
-    932:947:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):211:226 -> a
-    948:951:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):225:228 -> a
-    952:952:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    952:952:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):228 -> a
-    953:959:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):229:229 -> a
-    967:972:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):237:242 -> a
-    973:993:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):241:261 -> a
+    28:28:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):117 -> a
+    29:32:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:128 -> a
+    33:44:void computeDefaultInterfaceMethodMethods():337:348 -> a
+    33:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    45:805:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:760 -> a
+    45:805:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364 -> a
+    45:805:void computeDefaultInterfaceMethodMethods():348 -> a
+    45:805:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    806:807:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:368 -> a
+    806:807:void computeDefaultInterfaceMethodMethods():348 -> a
+    806:807:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    808:808:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    808:808:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368 -> a
+    808:808:void computeDefaultInterfaceMethodMethods():348 -> a
+    808:808:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    809:824:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:384 -> a
+    809:824:void computeDefaultInterfaceMethodMethods():348 -> a
+    809:824:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    825:829:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:387 -> a
+    825:829:void computeDefaultInterfaceMethodMethods():348 -> a
+    825:829:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    830:830:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):386:386 -> a
+    830:830:void computeDefaultInterfaceMethodMethods():348 -> a
+    830:830:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129 -> a
+    831:881:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):130:180 -> a
+    882:887:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):102:107 -> a
+    888:888:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:120 -> a
+    889:889:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    889:889:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120 -> a
+    890:891:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):121:122 -> a
+    892:893:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):190:191 -> a
+    894:894:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    894:894:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):191 -> a
+    895:904:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):194:203 -> a
+    905:912:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):323:330 -> a
+    905:912:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):203 -> a
+    913:913:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):329:329 -> a
+    913:913:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):203 -> a
+    914:918:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):328:332 -> a
+    914:918:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):203 -> a
+    919:927:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:212 -> a
+    928:943:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):209:224 -> a
+    944:947:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):223:226 -> a
+    948:948:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    948:948:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):226 -> a
+    949:955:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):227:227 -> a
+    963:968:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):235:240 -> a
+    969:989:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):239:259 -> a
+    990:990:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
+    990:990:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
+    991:993:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):262:264 -> a
     994:994:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    994:994:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):261 -> a
-    995:997:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):264:266 -> a
-    998:998:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    998:998:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):266 -> a
-    999:999:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):263:263 -> a
-    1000:1006:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):274:280 -> a
-    1007:1007:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    1007:1007:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):280 -> a
-    1008:1008:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):282:282 -> a
-    1009:1009:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):278:278 -> a
-    1010:1015:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:297 -> a
-    1016:1018:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296:298 -> a
-    1019:1019:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    1019:1019:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298 -> a
-    1020:1026:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):299:305 -> a
-    1027:1029:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):304:306 -> a
-    1030:1030:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> a
-    1030:1030:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):306 -> a
-    1031:1032:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):307:308 -> a
-    1033:1035:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):315:315 -> a
-    1037:1040:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):317:320 -> a
-    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):98:98 -> b
-    2:2:void lambda$computeMapping$4(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):207:207 -> b
-    3:3:void lambda$computeMapping$6(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):268:268 -> b
+    994:994:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):264 -> a
+    995:995:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):261:261 -> a
+    996:1002:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):272:278 -> a
+    1003:1003:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    1003:1003:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):278 -> a
+    1004:1004:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):280:280 -> a
+    1005:1005:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):276:276 -> a
+    1006:1011:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):290:295 -> a
+    1012:1014:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):294:296 -> a
+    1015:1015:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> a
+    1015:1015:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296 -> a
+    1016:1022:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):297:303 -> a
+    1023:1025:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302:304 -> a
+    1026:1026:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> a
+    1026:1026:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):304 -> a
+    1027:1028:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):305:306 -> a
+    1029:1031:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):313:313 -> a
+    1033:1036:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):315:318 -> a
+    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):99:99 -> b
+    2:2:void lambda$computeMapping$4(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):205:205 -> b
+    3:3:void lambda$computeMapping$6(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):266:266 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.L:
     java.util.Set mappedNames -> h
     boolean $assertionsDisabled -> i
     java.util.Map mappings -> g
-    1:1:void <clinit>():394:394 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Set):401:403 -> <init>
-    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):409:411 -> a
-    4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):416:419 -> a
-    8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):450:450 -> a
-    1:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):428:445 -> b
+    1:1:void <clinit>():392:392 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Set):399:401 -> <init>
+    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):407:409 -> a
+    4:7:boolean lambda$next$0(java.util.function.Predicate,java.lang.String):414:417 -> a
+    8:8:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):448:448 -> a
+    1:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):426:443 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.M:
     boolean $assertionsDisabled -> k
     java.util.Map mappedNames -> i
     com.android.tools.r8.graph.DexItemFactory factory -> j
-    1:1:void <clinit>():454:454 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):462:465 -> <init>
+    1:1:void <clinit>():452:452 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):460:463 -> <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):473:473 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> 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):473 -> 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):474:484 -> a
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> 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):485 -> 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):485:485 -> 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):484:484 -> 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):494:494 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> 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):496 -> 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):496:496 -> 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):494:494 -> 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):512:514 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> 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):514 -> 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):515:519 -> a
-    30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):568:574 -> a
-    30:36: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):519 -> a
-    37:37:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):571:571 -> a
-    37:37: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):519 -> a
-    38:40: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):523:525 -> a
-    41:41:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):530:530 -> a
-    42:42:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):535:535 -> a
-    43:61:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):539:557 -> a
-    1:1:com.android.tools.r8.graph.DexString lambda$next$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):482:482 -> b
-    2:2:com.android.tools.r8.graph.DexString lambda$next$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):501:501 -> b
+    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):471:471 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> 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):471 -> 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):472:482 -> a
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):483 -> 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):483:483 -> 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):482:482 -> 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):492:492 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> 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):494 -> 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):494:494 -> 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):492:492 -> 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):510:512 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):512 -> 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):513:517 -> a
+    30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):566:572 -> a
+    30:36: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):517 -> a
+    37:37:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):569:569 -> a
+    37:37: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):517 -> a
+    38:40: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):521:523 -> a
+    41:41:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):528:528 -> a
+    42:42:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):533:533 -> a
+    43:61:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):537:555 -> a
+    1:1:com.android.tools.r8.graph.DexString lambda$next$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):480:480 -> b
+    2:2:com.android.tools.r8.graph.DexString lambda$next$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):499:499 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ProguardMapMinifiedRenaming -> com.android.tools.r8.naming.N:
     java.util.Set unmappedReferences -> f
     java.util.Map classRenamingsMappingToDifferentName -> g
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming,java.util.Set):591:594 -> <init>
-    1:1:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):580:580 -> a
-    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):580:580 -> a
-    3:3:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):580:580 -> a
-    4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):580:580 -> a
-    5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):580:580 -> a
-    6:6:java.lang.String lookupPackageName(java.lang.String):580:580 -> a
-    7:8:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):596:597 -> a
-    9:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):611:621 -> a
-    9:19:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):605 -> a
-    20:20:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):620:620 -> a
-    20:20:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):605 -> a
-    21:25:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):619:623 -> a
-    21:25:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):605 -> a
-    26:26:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):607:607 -> a
-    1:1:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):580:580 -> b
-    1:1:java.lang.String toString():580:580 -> toString
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming,com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming,com.android.tools.r8.naming.FieldNameMinifier$FieldRenaming,java.util.Set):589:592 -> <init>
+    1:1:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):578:578 -> a
+    2:2:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):578:578 -> a
+    3:3:com.android.tools.r8.graph.DexString lookupMethodName(com.android.tools.r8.graph.DexCallSite):578:578 -> a
+    4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):578:578 -> a
+    5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):578:578 -> a
+    6:6:java.lang.String lookupPackageName(java.lang.String):578:578 -> a
+    7:8:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):594:595 -> a
+    9:19:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):609:619 -> a
+    9:19:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):603 -> a
+    20:20:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):618:618 -> a
+    20:20:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):603 -> a
+    21:25:void checkForUseOfNotMappedReference(com.android.tools.r8.graph.DexType):617:621 -> a
+    21:25:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):603 -> a
+    26:26:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):605:605 -> a
+    1:1:boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod):578:578 -> b
+    1:1:java.lang.String toString():578:578 -> toString
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.Q:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -57813,28 +58729,28 @@
     1:2:int hashCode():42:43 -> hashCode
     1:1:java.lang.String toString():24:24 -> toString
 com.android.tools.r8.naming.ReservedFieldNamingState -> com.android.tools.r8.naming.V:
-    1:1:void <init>(com.android.tools.r8.graph.AppView):17:17 -> <init>
-    1:2:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):34:35 -> a
-    3:6:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.FieldNamingStateBase.getInternalStateKey(com.android.tools.r8.graph.DexType):38:41 -> a
-    3:6:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getInternalState(com.android.tools.r8.graph.DexType):24 -> a
-    3:6:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):25 -> a
-    3:6:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):21 -> a
-    7:7:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getInternalState(com.android.tools.r8.graph.DexType):25:25 -> a
-    7:7:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):25 -> a
-    7:7:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):21 -> a
-    8:9:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):25:26 -> a
-    8:9:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):21 -> a
-    10:10:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():47:47 -> a
-    10:10:java.lang.Object createInternalState():14 -> a
-    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState):40:41 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView):18:18 -> <init>
+    1:2:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState):35:36 -> a
+    3:6:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.FieldNamingStateBase.getInternalStateKey(com.android.tools.r8.graph.DexType):40:43 -> a
+    3:6:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getInternalState(com.android.tools.r8.graph.DexType):26 -> a
+    3:6:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):26 -> a
+    3:6:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):22 -> a
+    7:7:java.lang.Object com.android.tools.r8.naming.FieldNamingStateBase.getInternalState(com.android.tools.r8.graph.DexType):27:27 -> a
+    7:7:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):26 -> a
+    7:7:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):22 -> a
+    8:9:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):26:27 -> a
+    8:9:boolean isReserved(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):22 -> a
+    10:10:com.android.tools.r8.naming.ReservedFieldNamingState$InternalState createInternalState():48:48 -> a
+    10:10:java.lang.Object createInternalState():15 -> a
+    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState):41:42 -> b
 com.android.tools.r8.naming.ReservedFieldNamingState$InternalState -> com.android.tools.r8.naming.U:
     java.util.Map reservedNamesDirect -> a
     java.util.Map reservedNamesBelow -> b
-    1:4:void <init>():50:53 -> <init>
-    1:2:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString):56:57 -> a
-    3:3:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):61:61 -> a
-    4:4:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):65:65 -> a
-    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):69:70 -> b
+    1:4:void <init>():51:54 -> <init>
+    1:2:com.android.tools.r8.graph.DexString getReservedByName(com.android.tools.r8.graph.DexString):57:58 -> a
+    3:3:void markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):62:62 -> a
+    4:4:void includeReservations(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):66:66 -> a
+    1:2:void includeReservationsFromBelow(com.android.tools.r8.naming.ReservedFieldNamingState$InternalState):70:71 -> b
 com.android.tools.r8.naming.SeedMapper -> com.android.tools.r8.naming.W:
     com.android.tools.r8.com.google.common.collect.ImmutableMap mappings -> a
     java.util.Set mappedToDescriptorNames -> b
@@ -57849,11 +58765,11 @@
     4:4:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
     5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):79:81 -> a
     5:7:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):77:81 -> a
-    8:12:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
-    13:13:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):145:145 -> a
-    14:14:java.util.Set getKeyset():149:149 -> a
-    15:15:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):157:157 -> a
+    8:8:com.android.tools.r8.naming.SeedMapper seedMapperFromInputStream(com.android.tools.r8.utils.Reporter,java.io.InputStream):77:77 -> a
+    8:8:com.android.tools.r8.naming.SeedMapper seedMapperFromFile(com.android.tools.r8.utils.Reporter,java.nio.file.Path):85 -> a
+    9:9:com.android.tools.r8.naming.ClassNamingForMapApplier getClassNaming(com.android.tools.r8.graph.DexType):145:145 -> a
+    10:10:java.util.Set getKeyset():149:149 -> a
+    11:11:com.android.tools.r8.naming.ClassNamingForMapApplier getMapping(java.lang.String):157:157 -> a
     1:1:java.util.Set getMappedToDescriptorNames():153:153 -> b
     1:10:void verifyMappingsAreConflictFree():107:116 -> c
     11:11:void verifyMappingsAreConflictFree():113:113 -> c
@@ -57882,7 +58798,7 @@
     1:7:void run():30:36 -> a
     8:23:com.android.tools.r8.graph.DexString getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):81:96 -> a
     8:23:void run():41 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
     24:24:com.android.tools.r8.graph.DexString getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):96 -> a
     24:24:void run():41 -> a
     25:25:com.android.tools.r8.graph.DexString getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):96:96 -> a
@@ -58040,31 +58956,31 @@
     2:6:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):43:47 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.naming.signature.GenericSignatureRewriter):32:32 -> a
     2:2:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):56:56 -> a
-    3:9:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):59:65 -> a
-    10:10:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):64:64 -> a
-    11:28:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):63:80 -> a
-    29:29:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):69:69 -> a
-    30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    30:30:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):69 -> a
+    3:11:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):59:67 -> a
+    12:12:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):64:64 -> a
+    13:30:void lambda$run$5(com.android.tools.r8.graph.DexProgramClass):63:80 -> a
     31:31:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):69:69 -> a
-    32:32:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):74:74 -> a
-    33:33:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> a
-    34:34:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):72:72 -> a
-    35:35:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78:78 -> a
-    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    36:36:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):79 -> a
-    37:37:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78:78 -> a
-    38:38:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
-    39:39:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):83:83 -> a
-    40:40:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
-    41:41:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):88:88 -> a
-    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    42:42:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):89 -> a
-    43:43:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):88:88 -> a
-    44:55: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):103:114 -> a
-    56:61:boolean verifyConsistentRenaming(java.util.function.Consumer,java.util.function.Supplier,java.lang.String):152:157 -> a
-    56:61: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):114 -> a
-    62:90: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):115:143 -> a
+    32:32:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    32:32:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):69 -> a
+    33:33:void lambda$run$0(com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):69:69 -> a
+    34:36:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):74:76 -> a
+    37:37:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):73:73 -> a
+    38:38:void lambda$run$2(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):72:72 -> a
+    39:39:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78:78 -> a
+    40:40:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    40:40:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):79 -> a
+    41:41:void lambda$run$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):78:78 -> a
+    42:44:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):84:86 -> a
+    45:45:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):83:83 -> a
+    46:46:void lambda$run$4(com.android.tools.r8.naming.signature.GenericSignatureParser,com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):82:82 -> a
+    47:47:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):88:88 -> a
+    48:48:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    48:48:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):89 -> a
+    49:49:void lambda$run$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.lang.String,java.lang.reflect.GenericSignatureFormatError):88:88 -> a
+    50:61: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):103:114 -> a
+    62:67:boolean verifyConsistentRenaming(java.util.function.Consumer,java.util.function.Supplier,java.lang.String):152:157 -> a
+    62: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):114 -> a
+    68:96: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):115:143 -> a
     1:1:java.util.Map access$100(com.android.tools.r8.naming.signature.GenericSignatureRewriter):32:32 -> b
     1:1:com.android.tools.r8.utils.Reporter access$200(com.android.tools.r8.naming.signature.GenericSignatureRewriter):32:32 -> c
 com.android.tools.r8.naming.signature.GenericSignatureRewriter$GenericSignatureCollector -> com.android.tools.r8.naming.Z.c:
@@ -58098,81 +59014,100 @@
     2:2:void start():284:284 -> b
     1:1:java.lang.String getRenamedSignature():171:171 -> c
     1:1:void removeWrittenClassCharacter():234:234 -> d
-com.android.tools.r8.optimize.BridgeHoisting -> com.android.tools.r8.z.c:
+com.android.tools.r8.optimize.BridgeHoisting -> com.android.tools.r8.y.c:
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens$Builder lensBuilder -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():53:53 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):60:60 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):58:61 -> <init>
-    1:10:void run():65:74 -> a
-    11:11:void run():73:73 -> a
-    12:12:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):68:68 -> a
-    13:16:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):79:82 -> a
-    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    17:17:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):82 -> a
-    18:22:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):82:86 -> a
-    23:27:java.util.Set getCandidatesForHoisting(java.util.Set):94:98 -> a
-    23:27:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):88 -> a
-    28:34:boolean bridgeIsTargetingMethodInSuperclass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):131:137 -> a
-    28:34:java.util.Set getCandidatesForHoisting(java.util.Set):102 -> a
-    28:34:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):88 -> a
-    35:35:java.util.Set getCandidatesForHoisting(java.util.Set):103:103 -> a
-    35:35:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):88 -> a
-    36:37:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):88:89 -> a
-    38:80:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):149:191 -> a
-    38:80:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    81:84:com.android.tools.r8.graph.ProgramMethod findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):216:219 -> a
-    81:84:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):194 -> a
-    81:84:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    85:85:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):195:195 -> a
-    85:85:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    86:89:boolean mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):227:230 -> a
-    86:89:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):198 -> a
-    86:89:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    90:90:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():345:345 -> a
-    90:90:boolean mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):230 -> a
-    90:90:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):198 -> a
-    90:90:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    91:99:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):203:211 -> a
-    91:99:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):89 -> a
-    100:100:int lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
-com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens -> com.android.tools.r8.z.b:
-    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap):238:244 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap):237:237 -> <init>
-com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens$Builder -> com.android.tools.r8.z.a:
+    boolean $assertionsDisabled -> d
+    1:4:void <clinit>():68:71 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):78:78 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):76:79 -> <init>
+    1:10:void run():83:92 -> a
+    11:11:void run():91:91 -> a
+    12:12:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):86:86 -> a
+    13:16:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):97:100 -> a
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    17:17:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):100 -> a
+    18:22:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):100:104 -> a
+    23:29:java.util.Set getCandidatesForHoisting(java.util.Set):112:118 -> a
+    23:29:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):106 -> a
+    30:31:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):106:107 -> a
+    32:32:int lambda$processClass$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):98:98 -> a
+    33:82:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):164:213 -> a
+    83:85:java.util.Map$Entry findMostFrequentBridge(java.util.Map):266:268 -> a
+    83:85:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):216 -> a
+    86:88:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):217:219 -> a
+    89:92:com.android.tools.r8.graph.ProgramMethod findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):276:279 -> a
+    89:92:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):222 -> a
+    93:96:boolean mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):287:290 -> a
+    93:96:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):225 -> a
+    97:97:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():342:342 -> a
+    97:97:boolean mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):290 -> a
+    97:97:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):225 -> a
+    98:110:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):231:243 -> a
+    111:113:com.android.tools.r8.graph.Code createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):294:296 -> a
+    111:113:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244 -> a
+    114:132:com.android.tools.r8.graph.CfCode createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):305:323 -> a
+    114:132:com.android.tools.r8.graph.Code createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):296 -> a
+    114:132:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244 -> a
+    133:134:com.android.tools.r8.graph.Code createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):298:299 -> a
+    133:134:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244 -> a
+    135:156:com.android.tools.r8.graph.DexCode createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):327:348 -> a
+    135:156:com.android.tools.r8.graph.Code createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):299 -> a
+    135:156:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244 -> a
+    157:171:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244:258 -> a
+    172:172:com.android.tools.r8.graph.Code createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):301:301 -> a
+    172:172:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):244 -> a
+    173:173:com.android.tools.r8.graph.ProgramMethod findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):282:282 -> a
+    173:173:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):222 -> a
+    174:174:java.util.List lambda$hoistBridgeIfPossible$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):208:208 -> a
+com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens -> com.android.tools.r8.y.b:
+    1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap):356:362 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap):355:355 -> <init>
+com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens$Builder -> com.android.tools.r8.y.a:
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():252:252 -> <clinit>
-    1:3:void <init>():252:254 -> <init>
-    1:1:boolean isEmpty():257:257 -> a
-    2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):261:261 -> a
-    3:3:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):265:265 -> a
-    4:4:boolean isEmpty():257:257 -> a
-    4:4:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):265 -> a
-    5:6:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):265:266 -> a
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.z.d:
+    1:1:void <clinit>():370:370 -> <clinit>
+    1:3:void <init>():370:372 -> <init>
+    1:1:boolean isEmpty():375:375 -> a
+    2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):379:379 -> a
+    3:3:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):383:383 -> a
+    4:4:boolean isEmpty():375:375 -> a
+    4:4:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):383 -> a
+    5:6:com.android.tools.r8.optimize.BridgeHoisting$BridgeHoistingLens build(com.android.tools.r8.graph.AppView):383:384 -> a
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.y.d:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder lenseBuilder -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):41:41 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):36:45 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):64:64 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):71:81 -> a
-    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):65 -> a
-    13:37:void publicizeType(com.android.tools.r8.graph.DexType):85:109 -> a
-    38:44:void publicizeType(com.android.tools.r8.graph.DexType):107:113 -> a
-    45:45:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
-    45:45:void publicizeType(com.android.tools.r8.graph.DexType):113 -> a
-    46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):90:90 -> a
-    47:92:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):117:162 -> a
-    47:92:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    93:93:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
-    93:93:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):95 -> a
-    94:94:void lambda$publicizeType$1(com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.z.e:
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):43:43 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):38:47 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):66:66 -> a
+    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73:83 -> a
+    2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):67 -> a
+    13:17:void publicizeType(com.android.tools.r8.graph.DexType):87:91 -> a
+    18:18:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> a
+    18:18:void publicizeType(com.android.tools.r8.graph.DexType):91 -> a
+    19:55:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):95:131 -> a
+    56:56:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):129:129 -> a
+    57:62:boolean publicizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):136:141 -> a
+    57:62:void lambda$publicizeClass$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    63:63:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():338:338 -> a
+    63:63:boolean publicizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):144 -> a
+    63:63:void lambda$publicizeClass$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    64:101:boolean publicizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):149:186 -> a
+    64:101:void lambda$publicizeClass$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    102:102:boolean publicizeMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):152:152 -> a
+    102:102:void lambda$publicizeClass$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):117 -> a
+    103:103:void lambda$publicizeClass$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):118:118 -> a
+    104:104:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():155:155 -> a
+    104:104:void lambda$publicizeClass$0(com.android.tools.r8.graph.DexEncodedField):100 -> a
+    105:105:void lambda$publicizeClass$0(com.android.tools.r8.graph.DexEncodedField):103:103 -> a
+    106:106:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():147:147 -> a
+    106:106:void lambda$publicizeClass$0(com.android.tools.r8.graph.DexEncodedField):106 -> a
+    107:107:void lambda$publicizeClass$0(com.android.tools.r8.graph.DexEncodedField):110:110 -> a
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.y.f:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> a
     com.android.tools.r8.graph.DexMethod target -> b
     boolean $assertionsDisabled -> c
@@ -58195,97 +59130,101 @@
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):92:92 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):97:97 -> registerStaticFieldWrite
     1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):102:102 -> registerTypeReference
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.z.f:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.y.e:
+    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
+    com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind SUPER -> c
+    com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
+    1:5:void <clinit>():106:110 -> <clinit>
+    1:1:void <init>(java.lang.String,int):105:105 -> <init>
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.y.g:
     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
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense lense -> b
-    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):216:216 -> 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:16:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):45:58 -> a
-    17:17:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):81:81 -> a
-    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    18:18:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):81 -> a
-    19:35:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):85:101 -> a
-    36:36:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):108:108 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    37:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):108 -> a
-    38:39:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):108:109 -> a
-    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    40:40:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):109 -> a
-    41:42:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):110:111 -> a
-    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    43:43:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):111 -> a
-    44:44:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113:113 -> a
-    45:45:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):125:125 -> a
-    46:51:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):132:137 -> a
-    52:52:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    52:52:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):137 -> a
-    53:60:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):138:145 -> a
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    61:61:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    62:62:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):146:146 -> a
-    63:63:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):176:176 -> a
-    63:63:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):152 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> a
-    64:64:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):176 -> a
-    64:64:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):152 -> a
-    65:68:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):176:179 -> a
-    65:68:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):152 -> a
-    69:69:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):155:155 -> a
-    70:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):196:202 -> a
-    70:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):154 -> a
-    77:79:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):161:163 -> a
-    80:88:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):245:253 -> a
-    80:88:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):165 -> a
-    89:89:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
-    90:90:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):163:163 -> a
-    91:92:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):220:221 -> a
-    91:92:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
-    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    93:93:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):221 -> a
-    93:93:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
-    94:100:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):225:231 -> a
-    94:100:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
-    101:104:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):207:210 -> a
-    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    105:105:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):210 -> a
-    106:110:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):212:216 -> a
-    111:117:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):261:267 -> a
-    118:118:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    118:118:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):267 -> a
-    119:123:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):268:272 -> a
-    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    124:124:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):272 -> a
-    125:135:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):273:283 -> a
-    136:138:void computeFieldRebinding():289:291 -> a
-    139:139:void computeFieldRebindingForIndirectAccesses(com.android.tools.r8.graph.FieldAccessInfo):295:295 -> a
-    140:158:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):301:319 -> a
-    159:159:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):63:63 -> a
-    159:159:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):320 -> a
-    160:160:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    160:160:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):63 -> a
-    160:160:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):320 -> a
-    161:173:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):64:76 -> a
-    161:173:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):320 -> a
-    174:174:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):320:320 -> a
-    175:175:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,java.util.Set):319:319 -> a
-    176:178:boolean lambda$computeFieldRebindingForIndirectAccessWithContexts$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):317:317 -> a
-    179:179:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):335:335 -> a
-    180:180:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> a
-    180:180:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):336 -> a
-    181:181:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):337:337 -> a
-    182:184:boolean isClassTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):342:344 -> a
-    185:190:boolean isMemberVisibleFromOriginalContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):349:354 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):117:117 -> b
-    2:6:boolean isTypeVisibleFromContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):326:330 -> b
-    7:21:com.android.tools.r8.graph.GraphLense run():358:372 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):121:121 -> c
-com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.z.h:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.AppView):37:42 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):46:46 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    2:2:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):46 -> a
+    3:16:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):47:60 -> a
+    17:17:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):83:83 -> a
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    18:18:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):83 -> a
+    19:35:com.android.tools.r8.graph.DexType firstLibraryClassForInterfaceTarget(java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):87:103 -> a
+    36:36:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):110:110 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    37:37:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):110 -> a
+    38:39:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):110:111 -> a
+    40:40:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    40:40:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):111 -> a
+    41:42:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):112:113 -> a
+    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    43:43:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113 -> a
+    44:44:com.android.tools.r8.graph.DexType firstLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):115:115 -> a
+    45:45:com.android.tools.r8.graph.DexEncodedMethod anyLookup(com.android.tools.r8.graph.DexMethod):127:127 -> a
+    46:51:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):134:139 -> a
+    52:52:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    52:52:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):139 -> a
+    53:60:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):140:147 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    61:61:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):147 -> a
+    62:62:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):148:148 -> a
+    63:63:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):178:178 -> a
+    63:63:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):154 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> a
+    64:64:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):178 -> a
+    64:64:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):154 -> a
+    65:68:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):178:181 -> a
+    65:68:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):154 -> a
+    69:69:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):157:157 -> a
+    70:76:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):198:204 -> a
+    70:76:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):156 -> a
+    77:79:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):163:165 -> a
+    80:88:com.android.tools.r8.graph.DexEncodedMethod insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.util.function.Function):249:257 -> a
+    80:88:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):167 -> a
+    89:89:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):171:171 -> a
+    90:93:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):209:212 -> a
+    94:94:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    94:94:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):212 -> a
+    95:99:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):214:218 -> a
+    100:101:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):222:223 -> a
+    100:101:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
+    102:102:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    102:102:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):223 -> a
+    102:102:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
+    103:103:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):229:229 -> a
+    103:103:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
+    104:108:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):228:232 -> a
+    104:108:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
+    109:113:boolean mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):231:235 -> a
+    109:113:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):165 -> a
+    114:120:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):265:271 -> a
+    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):271 -> a
+    122:126:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):272:276 -> a
+    127:127:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    127:127:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):276 -> a
+    128:138:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):277:287 -> a
+    139:141:void computeFieldRebinding():293:295 -> a
+    142:142:void computeFieldRebindingForIndirectAccesses(com.android.tools.r8.graph.FieldAccessInfo):299:299 -> a
+    143:161:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):305:323 -> a
+    162:172:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):322:332 -> a
+    173:173:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):65:65 -> a
+    173:173:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):334 -> a
+    174:174:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> a
+    174:174:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):65 -> a
+    174:174:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):334 -> a
+    175:187:com.android.tools.r8.graph.DexField validTargetFor(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,java.util.function.BiFunction):66:78 -> a
+    175:187:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):334 -> a
+    188:188:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):334:334 -> a
+    189:189:void computeFieldRebindingForIndirectAccessWithContexts(com.android.tools.r8.graph.DexField,com.android.tools.r8.utils.collections.ProgramMethodSet):332:332 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod classLookup(com.android.tools.r8.graph.DexMethod):119:119 -> b
+    2:16:com.android.tools.r8.graph.GraphLense run():339:353 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):123:123 -> c
+com.android.tools.r8.optimize.MemberRebindingLense -> com.android.tools.r8.y.i:
     java.util.Map methodMaps -> b
     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):69:75 -> <init>
@@ -58297,7 +59236,7 @@
     8:8: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):96:96 -> lookupMethod
     1:1:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):103:103 -> lookupMethodInAllContexts
     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):108:108 -> mapInvocationType
-com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.z.g:
+com.android.tools.r8.optimize.MemberRebindingLense$Builder -> com.android.tools.r8.y.h:
     java.util.Map fieldMap -> b
     java.util.Map methodMaps -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -58309,7 +59248,7 @@
     5:11:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):43:49 -> a
     12:12:java.util.Map lambda$map$0(com.android.tools.r8.ir.code.Invoke$Type):47:47 -> a
     13:16:com.android.tools.r8.graph.GraphLense build(com.android.tools.r8.graph.GraphLense):53:56 -> a
-com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.z.k:
+com.android.tools.r8.optimize.PublicizerLense -> com.android.tools.r8.y.l:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set publicizedMethods -> b
     boolean $assertionsDisabled -> c
@@ -58321,52 +59260,52 @@
     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):216:216 -> lookupMethod
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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.z.i:
-com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.z.j:
+com.android.tools.r8.optimize.PublicizerLense$1 -> com.android.tools.r8.y.j:
+com.android.tools.r8.optimize.PublicizerLense$PublicizedLenseBuilder -> com.android.tools.r8.y.k:
     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.z.l:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.y.m:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
-    1:3:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):28:30 -> a
-    4:12:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):29:37 -> a
-    13:17:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):35:39 -> a
-    18:28:com.android.tools.r8.graph.DexEncodedMethod[] removeUnneededVisibilityBridges(com.android.tools.r8.utils.ForEachable,int):45:55 -> a
-    29:30:void lambda$removeUnneededVisibilityBridges$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.ProgramMethod):57:58 -> a
-    31:34:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):67:70 -> a
-    31:34:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():329:329 -> a
-    35:35:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71 -> a
-    35:35:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    36:46:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71:81 -> a
-    36:46:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    47:47:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):117:117 -> a
-    47:47:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):81 -> a
+    1:1:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> a
+    2:10:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):29:37 -> a
+    11:15:void removeUnneededVisibilityBridgesFromClass(com.android.tools.r8.graph.DexProgramClass):35:39 -> a
+    16:26:com.android.tools.r8.graph.DexEncodedMethod[] removeUnneededVisibilityBridges(com.android.tools.r8.utils.ForEachable,int):45:55 -> a
+    27:28:void lambda$removeUnneededVisibilityBridges$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.ProgramMethod):57:58 -> a
+    29:32:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):67:70 -> a
+    29:32:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    33:33:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():326:326 -> a
+    33:33:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71 -> a
+    33:33:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    34:44:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71:81 -> a
+    34:44:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    45:45:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):118:118 -> a
+    45:45:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):81 -> a
+    45:45:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    46:46:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:82 -> a
+    46:46:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    47:47:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():338:338 -> a
+    47:47:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82 -> a
     47:47:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    48:48:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:82 -> a
-    48:48:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():341:341 -> a
-    49:49:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82 -> a
-    49:49:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    50:58:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:90 -> a
-    50:58:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    59:59:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):89:89 -> a
-    59:59:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    60:60:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):49:49 -> a
-    61:62:void run():100:101 -> a
-com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.A.a.a.a:
+    48:56:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:90 -> a
+    48:56:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    57:57:boolean isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):89:89 -> a
+    57:57:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
+    58:58:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):49:49 -> a
+    59:60:void run():100:101 -> a
+com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.z.a.a.a:
     1:1:void <init>(int):59:59 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):70:72 -> <init>
     void visit(java.lang.String,java.lang.Object) -> a
@@ -58374,7 +59313,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.A.a.a.b:
+com.android.tools.r8.org.objectweb.asm.AnnotationWriter -> com.android.tools.r8.z.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
@@ -58407,7 +59346,7 @@
     179:181:int computeParameterAnnotationsSize(java.lang.String,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int):498:500 -> a
     182:205:void putParameterAnnotations(int,com.android.tools.r8.org.objectweb.asm.AnnotationWriter[],int,com.android.tools.r8.org.objectweb.asm.ByteVector):526:549 -> a
     1:8:int computeAnnotationsSize(java.lang.String):334:341 -> b
-com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.A.a.a.d:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.z.a.a.d:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -58431,7 +59370,7 @@
     30:30:void putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):311 -> a
     31:33: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
     34:44: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.A.a.a.c:
+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[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -58441,7 +59380,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.A.a.a.e:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.z.a.a.e:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -58460,7 +59399,7 @@
     16:26:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:10:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> c
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.A.a.a.f:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.z.a.a.f:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     byte[] b -> a
@@ -58473,146 +59412,142 @@
     2:2:void <init>(byte[],int,int):176:176 -> <init>
     3:73:void <init>(byte[],int,boolean):188:258 -> <init>
     74:106:void <init>(byte[],int,boolean):239:271 -> <init>
-    107:107:void <init>(java.io.InputStream):283:283 -> <init>
-    1:12:byte[] readStream(java.io.InputStream,boolean):312:312 -> a
-    20:24:byte[] readStream(java.io.InputStream,boolean):320:324 -> a
-    25:25:byte[] readStream(java.io.InputStream,boolean):310:310 -> a
-    26:139:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
-    140:146:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
-    147:147:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):717:717 -> a
-    147:147:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    148:148:java.lang.String readStringish(int,char[]):3494:3494 -> a
-    148:148:java.lang.String readModule(int,char[]):3524 -> a
-    148:148:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):721 -> a
-    148:148:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    149:246:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):722:819 -> a
-    149:246:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
-    247:270:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):550:573 -> a
-    271:290:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):572:591 -> a
-    291:312:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):590:611 -> a
-    313:338:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):610:635 -> a
-    339:379:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):634:674 -> a
-    380:390:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):670:680 -> a
-    391:478:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):836:923 -> a
-    391:478:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    479:498:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):922:941 -> a
-    479:498:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    499:520:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):940:961 -> a
-    499:520:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    521:546:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):960:985 -> a
-    521:546:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    547:569:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):984:1006 -> a
-    547:569:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
-    570:570:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):685:685 -> a
-    571:678:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1020:1127 -> a
-    571:678:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    679:699:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1123:1143 -> a
-    679:699:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    700:720:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1139:1159 -> a
-    700:720:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    721:748:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1157:1184 -> a
-    721:748:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    749:768:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1183:1202 -> a
-    749:768:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    769:790:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1201:1222 -> a
-    769:790:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    791:816:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1221:1246 -> a
-    791:816:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    817:860:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1245:1288 -> a
-    817:860:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
-    861:861:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):692:692 -> a
-    862:1163:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1309:1610 -> a
-    1164:1217:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1512:1565 -> a
-    1218:1223:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1547:1552 -> a
-    1224:1492:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1491:1759 -> a
-    1493:1548:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2965:3020 -> a
-    1493:1548:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
-    1549:1567:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2998:3016 -> a
-    1549:1567:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
-    1568:1568:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2992:2992 -> a
-    1568:1568:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
-    1569:1575:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2989:2995 -> a
-    1569:1575:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
-    1576:1576:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2986:2986 -> a
-    1576:1576:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
-    1577:1648:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1771:1842 -> a
-    1649:1649:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1835:1835 -> a
-    1650:1725:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3046:3121 -> a
-    1650:1725:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1855 -> a
-    1726:1726:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3118:3118 -> a
-    1726:1726:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1855 -> a
-    1727:2127:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1864:2264 -> a
-    2128:2128:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2111:2111 -> a
-    2129:2129:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2110:2110 -> a
-    2130:2141:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2089:2100 -> a
-    2142:2142:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2092:2092 -> a
-    2143:2143:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2057:2057 -> a
-    2144:2349:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2055:2260 -> a
-    2350:2350:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2259:2259 -> a
-    2351:2354:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2119:2122 -> a
-    2355:2484:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2121:2250 -> a
-    2485:2500:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2226:2241 -> a
-    2501:2511:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2205:2215 -> a
-    2512:2522:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2151:2161 -> a
-    2523:2532:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2134:2143 -> a
-    2533:2533:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2050:2050 -> a
-    2534:2739:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2254 -> a
-    2740:2740:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2028:2028 -> a
-    2741:2930:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2004:2193 -> a
-    2931:2931:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2188:2188 -> a
-    2932:2932:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2184 -> a
-    2933:2933:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2180:2180 -> a
-    2934:3235:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1980:2281 -> a
-    3236:3265:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2280:2309 -> a
-    3266:3337:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2308:2379 -> a
-    3338:3367:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2378:2407 -> a
-    3368:3394:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2406:2432 -> a
-    3395:3395:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476:2476 -> a
-    3396:3399:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2446:2449 -> a
-    3396:3399:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2477 -> a
-    3400:3400:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2477:2477 -> a
-    3401:3406:int getTypeAnnotationBytecodeOffset(int[],int):2604:2609 -> a
-    3407:3465:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2625:2683 -> a
-    3466:3512:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2642:2688 -> a
-    3513:3526:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2711:2724 -> a
-    3527:3527:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2723:2723 -> a
-    3528:3545:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2753:2770 -> a
-    3546:3552:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2792:2798 -> a
-    3553:3706:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2796:2949 -> a
-    3707:3714:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2837:2844 -> a
-    3715:3738:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2841:2864 -> a
-    3739:3817:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2863:2941 -> a
-    3818:3818:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2940:2940 -> a
-    3819:3856:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2879:2916 -> a
-    3857:3877:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2903:2923 -> a
-    3878:3889:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2922:2933 -> a
-    3890:3894:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2932:2936 -> a
-    3895:3900:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2895:2900 -> a
-    3901:3906:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2871:2876 -> a
-    3907:3910:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2829:2829 -> a
-    3911:3913:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2823:2823 -> a
-    3914:3914:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2819:2819 -> a
-    3915:3915:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
-    3916:3918:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2810:2810 -> a
-    3919:3921:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2805:2805 -> a
-    3970:3970:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2854:2854 -> a
-    3971:3971:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2853:2853 -> a
-    3972:4004:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3146:3178 -> a
-    4005:4005:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3174:3174 -> a
-    4006:4006:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3170:3170 -> a
-    4007:4007:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3167:3167 -> a
-    4008:4008:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3164:3164 -> a
-    4009:4009:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3161:3161 -> a
-    4010:4010:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3158:3158 -> a
-    4011:4011:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3155:3155 -> a
-    4012:4012:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3152:3152 -> a
-    4013:4013:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3149:3149 -> a
-    4014:4043:int getFirstAttributeOffset():3197:3226 -> a
-    4044:4050:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3297:3303 -> a
-    4051:4051:int getItem(int):3330:3330 -> a
-    4052:4068:java.lang.String readUtf(int,int,char[]):3459:3475 -> a
-    4069:4069:java.lang.String readStringish(int,char[]):3494:3494 -> a
-    4069:4069:java.lang.String readClass(int,char[]):3509 -> a
+    1:114:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):421:534 -> a
+    115:121:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):533:539 -> a
+    122:122:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):717:717 -> a
+    122:122:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
+    123:123:java.lang.String readStringish(int,char[]):3494:3494 -> a
+    123:123:java.lang.String readModule(int,char[]):3524 -> a
+    123:123:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):721 -> a
+    123:123:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
+    124:221:void readModuleAttributes(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,int,java.lang.String):722:819 -> a
+    124:221:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):544 -> a
+    222:245:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):550:573 -> a
+    246:265:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):572:591 -> a
+    266:287:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):590:611 -> a
+    288:313:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):610:635 -> a
+    314:354:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):634:674 -> a
+    355:365:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):670:680 -> a
+    366:453:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):836:923 -> a
+    366:453:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
+    454:473:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):922:941 -> a
+    454:473:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
+    474:495:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):940:961 -> a
+    474:495:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
+    496:521:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):960:985 -> a
+    496:521:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
+    522:544:int readField(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):984:1006 -> a
+    522:544:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):683 -> a
+    545:545:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):685:685 -> a
+    546:653:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1020:1127 -> a
+    546:653:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    654:674:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1123:1143 -> a
+    654:674:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    675:695:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1139:1159 -> a
+    675:695:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    696:723:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1157:1184 -> a
+    696:723:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    724:743:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1183:1202 -> a
+    724:743:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    744:765:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1201:1222 -> a
+    744:765:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    766:791:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1221:1246 -> a
+    766:791:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    792:835:int readMethod(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1245:1288 -> a
+    792:835:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):688 -> a
+    836:836:void accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,com.android.tools.r8.org.objectweb.asm.Attribute[],int):692:692 -> a
+    837:1138:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1309:1610 -> a
+    1139:1192:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1512:1565 -> a
+    1193:1198:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1547:1552 -> a
+    1199:1467:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1491:1759 -> a
+    1468:1523:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2965:3020 -> a
+    1468:1523:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
+    1524:1542:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2998:3016 -> a
+    1524:1542:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
+    1543:1543:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2992:2992 -> a
+    1543:1543:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
+    1544:1550:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2989:2995 -> a
+    1544:1550:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
+    1551:1551:void computeImplicitFrame(com.android.tools.r8.org.objectweb.asm.Context):2986:2986 -> a
+    1551:1551:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1761 -> a
+    1552:1623:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1771:1842 -> a
+    1624:1624:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1835:1835 -> a
+    1625:1700:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3046:3121 -> a
+    1625:1700:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1855 -> a
+    1701:1701:int readStackMapFrame(int,boolean,boolean,com.android.tools.r8.org.objectweb.asm.Context):3118:3118 -> a
+    1701:1701:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1855 -> a
+    1702:2102:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1864:2264 -> a
+    2103:2103:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2111:2111 -> a
+    2104:2104:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2110:2110 -> a
+    2105:2116:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2089:2100 -> a
+    2117:2117:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2092:2092 -> a
+    2118:2118:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2057:2057 -> a
+    2119:2324:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2055:2260 -> a
+    2325:2325:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2259:2259 -> a
+    2326:2329:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2119:2122 -> a
+    2330:2459:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2121:2250 -> a
+    2460:2475:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2226:2241 -> a
+    2476:2486:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2205:2215 -> a
+    2487:2497:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2151:2161 -> a
+    2498:2507:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2134:2143 -> a
+    2508:2508:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2050:2050 -> a
+    2509:2714:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2049:2254 -> a
+    2715:2715:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2028:2028 -> a
+    2716:2905:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2004:2193 -> a
+    2906:2906:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2188:2188 -> a
+    2907:2907:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2184:2184 -> a
+    2908:2908:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2180:2180 -> a
+    2909:3210:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):1980:2281 -> a
+    3211:3240:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2280:2309 -> a
+    3241:3312:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2308:2379 -> a
+    3313:3342:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2378:2407 -> a
+    3343:3369:void readCode(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int):2406:2432 -> a
+    3370:3370:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2476:2476 -> a
+    3371:3374:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2446:2449 -> a
+    3371:3374:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2477 -> a
+    3375:3375:void createDebugLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2477:2477 -> a
+    3376:3381:int getTypeAnnotationBytecodeOffset(int[],int):2604:2609 -> a
+    3382:3440:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2625:2683 -> a
+    3441:3487:int readTypeAnnotationTarget(com.android.tools.r8.org.objectweb.asm.Context,int):2642:2688 -> a
+    3488:3501:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2711:2724 -> a
+    3502:3502:void readParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.Context,int,boolean):2723:2723 -> a
+    3503:3520:int readElementValues(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,boolean,char[]):2753:2770 -> a
+    3521:3527:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2792:2798 -> a
+    3528:3681:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2796:2949 -> a
+    3682:3689:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2837:2844 -> a
+    3690:3713:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2841:2864 -> a
+    3714:3792:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2863:2941 -> a
+    3793:3793:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2940:2940 -> a
+    3794:3831:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2879:2916 -> a
+    3832:3852:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2903:2923 -> a
+    3853:3864:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2922:2933 -> a
+    3865:3869:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2932:2936 -> a
+    3870:3875:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2895:2900 -> a
+    3876:3881:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2871:2876 -> a
+    3882:3885:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2829:2829 -> a
+    3886:3888:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2823:2823 -> a
+    3889:3889:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2819:2819 -> a
+    3890:3890:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2818:2818 -> a
+    3891:3893:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2810:2810 -> a
+    3894:3896:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2805:2805 -> a
+    3945:3945:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2854:2854 -> a
+    3946:3946:int readElementValue(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,int,java.lang.String,char[]):2853:2853 -> a
+    3947:3979:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3146:3178 -> a
+    3980:3980:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3174:3174 -> a
+    3981:3981:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3170:3170 -> a
+    3982:3982:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3167:3167 -> a
+    3983:3983:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3164:3164 -> a
+    3984:3984:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3161:3161 -> a
+    3985:3985:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3158:3158 -> a
+    3986:3986:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3155:3155 -> a
+    3987:3987:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3152:3152 -> a
+    3988:3988:int readVerificationTypeInfo(int,java.lang.Object[],int,char[],com.android.tools.r8.org.objectweb.asm.Label[]):3149:3149 -> a
+    3989:4018:int getFirstAttributeOffset():3197:3226 -> a
+    4019:4025:com.android.tools.r8.org.objectweb.asm.Attribute readAttribute(com.android.tools.r8.org.objectweb.asm.Attribute[],java.lang.String,int,int,char[],int,com.android.tools.r8.org.objectweb.asm.Label[]):3297:3303 -> a
+    4026:4026:int getItem(int):3330:3330 -> a
+    4027:4043:java.lang.String readUtf(int,int,char[]):3459:3475 -> a
+    4044:4044:java.lang.String readStringish(int,char[]):3494:3494 -> a
+    4044:4044:java.lang.String readClass(int,char[]):3509 -> a
     1:4:com.android.tools.r8.org.objectweb.asm.Label readLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2446:2449 -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2462 -> b
     5:5:com.android.tools.r8.org.objectweb.asm.Label createLabel(int,com.android.tools.r8.org.objectweb.asm.Label[]):2463:2463 -> b
@@ -58643,9 +59578,13 @@
     1:2:short readShort(int):3375:3376 -> f
     3:9:java.lang.String readUtf(int,char[]):3437:3443 -> f
     1:2:int readUnsignedShort(int):3363:3364 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.A.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.A.a.a.h:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.z.a.a.g:
+    java.lang.String className -> a
+    int constantPoolCount -> b
+    1:3:void <init>(java.lang.String,int):49:51 -> <init>
+    1:1:java.lang.String getClassName():60:60 -> a
+    1:1:int getConstantPoolCount():69:69 -> b
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.z.a.a.h:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -58667,7 +59606,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.A.a.a.i:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.z.a.a.i:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -58722,7 +59661,7 @@
     221:240:byte[] toByteArray():639 -> b
     241:241:byte[] toByteArray():641:641 -> b
     242:242:byte[] toByteArray():538:538 -> b
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.A.a.a.j:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.z.a.a.j:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -58735,7 +59674,7 @@
     1:8:boolean equals(java.lang.Object):150:157 -> equals
     1:4:int hashCode():162:165 -> hashCode
     1:7:java.lang.String toString():170:176 -> toString
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.A.a.a.k:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.z.a.a.k:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -58756,15 +59695,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.A.a.a.l:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.z.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.A.a.a.m:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.z.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.A.a.a.n:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.z.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>
@@ -58772,7 +59711,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):83:84 -> a
     3:4: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.A.a.a.o:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.z.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
@@ -58794,7 +59733,7 @@
     67:67:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):272 -> a
     68:68:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.A.a.a.p:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.z.a.a.p:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -58891,7 +59830,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.A.a.a.q:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.z.a.a.q:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -58906,7 +59845,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.A.a.a.r:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.z.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
@@ -58922,7 +59861,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.A.a.a.s:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.z.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
@@ -58950,9 +59889,17 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):542:576 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):592:604 -> b
     1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.A.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.A.a.a.u:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.z.a.a.t:
+    java.lang.String className -> a
+    int codeSize -> d
+    java.lang.String descriptor -> c
+    java.lang.String methodName -> b
+    1:5:void <init>(java.lang.String,java.lang.String,java.lang.String,int):57:61 -> <init>
+    1:1:java.lang.String getClassName():70:70 -> a
+    1:1:int getCodeSize():97:97 -> b
+    1:1:java.lang.String getDescriptor():88:88 -> c
+    1:1:java.lang.String getMethodName():79:79 -> d
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.z.a.a.u:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -58997,7 +59944,7 @@
     7:8:void visitMaxs(int,int):763:764 -> c
     9:10:void visitEnd():773:774 -> c
     1:2:void visitVarInsn(int,int):349:350 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.A.a.a.v:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.z.a.a.v:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -59186,7 +60133,7 @@
     107:107:void putFrame():1914:1914 -> h
     107:107:void visitFrameEnd():1850 -> h
     108:111:void visitFrameEnd():1851:1854 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.A.a.a.w:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.z.a.a.w:
     1:1:void <init>(int):57:57 -> <init>
     2:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:70 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -59196,7 +60143,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.A.a.a.x:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.z.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
@@ -59225,7 +60172,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.A.a.a.y:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.z.a.a.y:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -59234,7 +60181,7 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():377:383 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.A.a.a.A:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.z.a.a.A:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -59376,7 +60323,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.A.a.a.z:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.z.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
@@ -59403,7 +60350,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.A.a.a.B:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.z.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
@@ -59440,7 +60387,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.A.a.a.C:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.z.a.a.C:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -59457,7 +60404,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.A.a.a.D.b:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.z.a.a.D.b:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -59496,7 +60443,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.A.a.a.D.a:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.z.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
@@ -59513,7 +60460,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.A.a.a.E.a:
+com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.z.a.a.E.a:
     java.util.List visibleTypeAnnotations -> b
     java.util.List invisibleTypeAnnotations -> c
     int index -> f
@@ -59530,7 +60477,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.A.a.a.E.b:
+com.android.tools.r8.org.objectweb.asm.tree.AnnotationNode -> com.android.tools.r8.z.a.a.E.b:
     java.util.List values -> b
     java.lang.String desc -> a
     1:3:void <init>(java.lang.String):63:65 -> <init>
@@ -59564,7 +60511,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.A.a.a.E.c:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.z.a.a.E.c:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -59572,7 +60519,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.A.a.a.E.d:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.z.a.a.E.d:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -59591,14 +60538,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.A.a.a.E.e:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.z.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.A.a.a.E.f:
+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.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -59620,7 +60567,7 @@
     1:1:java.util.ListIterator iterator():156 -> iterator
     1:1:java.util.Iterator iterator():38 -> iterator
     1:1:int size():61:61 -> size
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.A.a.a.E.f$a:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.z.a.a.E.f$a:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> a
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
@@ -59637,18 +60584,18 @@
     1:7:int previousIndex():561:567 -> previousIndex
     1:10:void remove():518:527 -> remove
     1:9:void set(java.lang.Object):585:593 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.A.a.a.E.g:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.z.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.A.a.a.E.h:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.z.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.A.a.a.E.i:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.z.a.a.E.i:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -59657,7 +60604,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.A.a.a.E.j:
+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.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
@@ -59666,7 +60613,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.A.a.a.E.k:
+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.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
@@ -59674,13 +60621,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.A.a.a.E.l:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.z.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.A.a.a.E.m:
+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.LabelNode start -> h
     int line -> g
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
@@ -59690,14 +60637,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.A.a.a.E.n:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.z.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.A.a.a.E.o:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.z.a.a.E.o:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -59705,7 +60652,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.A.a.a.E.p:
+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.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -59716,7 +60663,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.A.a.a.E.q:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.z.a.a.E.q:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -59725,7 +60672,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.A.a.a.E.s:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.z.a.a.E.s:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -59809,22 +60756,22 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):272:276 -> c
     6:7:void visitMaxs(int,int):515:516 -> c
     1:1:void visitVarInsn(int,int):351:351 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.A.a.a.E.r:
+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 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.A.a.a.E.t:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.z.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.A.a.a.E.u:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.z.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.A.a.a.E.v:
+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.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -59836,7 +60783,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.A.a.a.E.w:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.z.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
@@ -59844,30 +60791,30 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.A.a.a.E.x:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.z.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.A.a.a.E.y:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.z.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.A.a.a.E.z:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.z.a.a.E.z:
     1:2:java.util.List add(java.util.List,java.lang.Object):44:45 -> a
     3:5:java.util.List asArrayList(int):50:52 -> a
     6:10:java.util.List asArrayList(java.lang.Object[]):59:63 -> a
     11:15:java.util.List asArrayList(int[]):114:118 -> a
     16:18:java.util.List asArrayList(int,java.lang.Object[]):157:159 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.A.a.a.E.A:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.z.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.A.a.a.F.a:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.z.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:
@@ -59919,16 +60866,18 @@
     1:2:void <init>(java.lang.String,java.lang.Class):13:14 -> <init>
     1:1:java.lang.String part():20:20 -> part
 com.android.tools.r8.position.MethodPosition -> com.android.tools.r8.position.MethodPosition:
-    com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):20:21 -> <init>
-    1:2:boolean equals(java.lang.Object):63:64 -> equals
-    1:1:java.lang.String getDescription():53:53 -> getDescription
-    1:1:java.lang.String getHolder():31:31 -> getHolder
-    1:1:java.lang.String getName():26:26 -> getName
-    1:3:java.util.List getParameterTypes():41:43 -> getParameterTypes
-    1:1:java.lang.String getReturnType():36:36 -> getReturnType
-    1:1:int hashCode():58:58 -> hashCode
-    1:1:java.lang.String toString():48:48 -> toString
+    com.android.tools.r8.references.MethodReference method -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):21:21 -> <init>
+    2:3:void <init>(com.android.tools.r8.references.MethodReference):24:25 -> <init>
+    1:2:boolean equals(java.lang.Object):71:72 -> equals
+    1:1:java.lang.String getDescription():61:61 -> getDescription
+    1:1:java.lang.String getHolder():39:39 -> getHolder
+    1:1:com.android.tools.r8.references.MethodReference getMethod():30:30 -> getMethod
+    1:1:java.lang.String getName():34:34 -> getName
+    1:3:java.util.List getParameterTypes():49:51 -> getParameterTypes
+    1:1:java.lang.String getReturnType():44:44 -> getReturnType
+    1:1:int hashCode():66:66 -> hashCode
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.position.Position -> com.android.tools.r8.position.Position:
     1:1:void <clinit>():19:19 -> <clinit>
 com.android.tools.r8.position.Position$1 -> com.android.tools.r8.position.Position$a:
@@ -60065,22 +61014,24 @@
     5:5:com.android.tools.r8.references.TypeReference typeFromClass(java.lang.Class):89:89 -> a
     6:6:com.android.tools.r8.references.ArrayReference lambda$array$0(com.android.tools.r8.references.TypeReference,int,java.lang.String):136:136 -> a
     7:11:com.android.tools.r8.references.MethodReference lambda$method$1(com.android.tools.r8.references.MethodReference):149:153 -> a
-    12:12:com.android.tools.r8.references.FieldReference lambda$field$2(com.android.tools.r8.references.FieldReference):194:194 -> a
+    12:12:com.android.tools.r8.references.FieldReference lambda$field$2(com.android.tools.r8.references.FieldReference):210:210 -> a
     1:4:com.android.tools.r8.references.ArrayReference array(com.android.tools.r8.references.TypeReference,int):132:135 -> array
     1:1:com.android.tools.r8.references.ArrayReference arrayFromDescriptor(java.lang.String):126:126 -> arrayFromDescriptor
-    1:1:com.android.tools.r8.references.MethodReference classConstructor(com.android.tools.r8.references.ClassReference):185:185 -> classConstructor
+    1:1:com.android.tools.r8.references.MethodReference classConstructor(com.android.tools.r8.references.ClassReference):201:201 -> classConstructor
     1:1:com.android.tools.r8.references.ClassReference classFromBinaryName(java.lang.String):107:107 -> classFromBinaryName
     1:1:com.android.tools.r8.references.ClassReference classFromClass(java.lang.Class):121:121 -> classFromClass
     1:1:com.android.tools.r8.references.ClassReference classFromDescriptor(java.lang.String):98:98 -> classFromDescriptor
     1:1:com.android.tools.r8.references.ClassReference classFromTypeName(java.lang.String):116:116 -> classFromTypeName
-    1:2:com.android.tools.r8.references.FieldReference field(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.TypeReference):191:192 -> field
-    1:4:com.android.tools.r8.references.FieldReference fieldFromField(java.lang.reflect.Field):199:202 -> fieldFromField
+    1:2:com.android.tools.r8.references.FieldReference field(com.android.tools.r8.references.ClassReference,java.lang.String,com.android.tools.r8.references.TypeReference):207:208 -> field
+    1:4:com.android.tools.r8.references.FieldReference fieldFromField(java.lang.reflect.Field):215:218 -> fieldFromField
     1:3:com.android.tools.r8.references.MethodReference method(com.android.tools.r8.references.ClassReference,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):145:147 -> method
+    1:11:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):187:197 -> methodFromDescriptor
+    12:12:com.android.tools.r8.references.MethodReference methodFromDescriptor(java.lang.String,java.lang.String,java.lang.String):193:193 -> methodFromDescriptor
     1:13:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):158:170 -> methodFromMethod
     14:14:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Method):166:166 -> methodFromMethod
     15:21:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.reflect.Constructor):175:181 -> methodFromMethod
-    1:1:com.android.tools.r8.references.PackageReference packageFromPackage(java.lang.Package):213:213 -> packageFromPackage
-    1:1:com.android.tools.r8.references.PackageReference packageFromString(java.lang.String):208:208 -> packageFromString
+    1:1:com.android.tools.r8.references.PackageReference packageFromPackage(java.lang.Package):229:229 -> packageFromPackage
+    1:1:com.android.tools.r8.references.PackageReference packageFromString(java.lang.String):224:224 -> packageFromString
     1:20:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):79:98 -> primitiveFromDescriptor
     1:20:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):93 -> primitiveFromDescriptor
     21:33:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):82:94 -> primitiveFromDescriptor
@@ -60099,14 +61050,16 @@
 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.relocator.Relocator -> com.android.tools.r8.relocator.Relocator:
-    1:3:void lambda$run$0(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):50:52 -> a
-    1:1:void lambda$run$1(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):70:70 -> b
-    1:31:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):80:110 -> c
-    32:37:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):105:110 -> c
-    1:5:void run(com.android.tools.r8.relocator.RelocatorCommand):43:47 -> run
-    6:6:void run(com.android.tools.r8.relocator.RelocatorCommand):46:46 -> run
-    7:10:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService):65:68 -> run
-    11:11:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService):67:67 -> run
+    1:4:void lambda$run$0(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):49:52 -> a
+    1:1:void lambda$run$1(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):69:69 -> b
+    1:31:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):79:109 -> c
+    32:32:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> c
+    32:32:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):104 -> c
+    33:40:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):104:111 -> c
+    1:5:void run(com.android.tools.r8.relocator.RelocatorCommand):42:46 -> run
+    6:6:void run(com.android.tools.r8.relocator.RelocatorCommand):45:45 -> run
+    7:10:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService):64:67 -> run
+    11:11:void run(com.android.tools.r8.relocator.RelocatorCommand,java.util.concurrent.ExecutorService):66:66 -> run
 com.android.tools.r8.relocator.RelocatorCommand -> com.android.tools.r8.relocator.RelocatorCommand:
     com.android.tools.r8.ClassFileConsumer consumer -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap mapping -> g
@@ -60119,31 +61072,31 @@
     boolean printVersion -> b
     com.android.tools.r8.utils.AndroidApp app -> f
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:13:void <clinit>():41:53 -> <clinit>
+    1:13:void <clinit>():43:55 -> <clinit>
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):487:487 -> <clinit>
-    14:14:void <clinit>():52 -> <clinit>
-    15:15:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ClassFileConsumer,int,com.android.tools.r8.relocator.RelocatorCommand$1):42:42 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.relocator.RelocatorCommand$1):42:42 -> <init>
-    3:11:void <init>(boolean,boolean):73:81 -> <init>
-    12:20:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ClassFileConsumer,int):90:98 -> <init>
-    1:1:java.util.Set access$200():42:42 -> a
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():102:102 -> builder
-    2:2:void com.android.tools.r8.relocator.RelocatorCommand$Builder.<init>():180:180 -> builder
-    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():102 -> builder
-    3:3:com.android.tools.r8.relocator.RelocatorCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):110:110 -> builder
-    4:4:void com.android.tools.r8.relocator.RelocatorCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):184:184 -> builder
-    4:4:com.android.tools.r8.relocator.RelocatorCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):110 -> builder
-    1:1:com.android.tools.r8.utils.AndroidApp getApp():130:130 -> getApp
-    1:1:com.android.tools.r8.ClassFileConsumer getConsumer():122:122 -> getConsumer
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():118:118 -> getFactory
-    1:17:com.android.tools.r8.utils.InternalOptions getInternalOptions():143:159 -> getInternalOptions
-    1:1:java.util.Map getMapping():164:164 -> getMapping
-    1:1:com.android.tools.r8.utils.Reporter getReporter():114:114 -> getReporter
-    1:1:int getThreadCount():126:126 -> getThreadCount
-    1:1:boolean isPrintHelp():134:134 -> isPrintHelp
-    1:1:boolean isPrintVersion():138:138 -> isPrintVersion
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):106:106 -> parse
+    14:14:void <clinit>():54 -> <clinit>
+    15:15:void <clinit>():52:52 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ClassFileConsumer,int,com.android.tools.r8.relocator.RelocatorCommand$1):44:44 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.relocator.RelocatorCommand$1):44:44 -> <init>
+    3:11:void <init>(boolean,boolean):75:83 -> <init>
+    12:20:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ClassFileConsumer,int):92:100 -> <init>
+    1:1:java.util.Set access$000():44:44 -> a
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():104:104 -> builder
+    2:2:void com.android.tools.r8.relocator.RelocatorCommand$Builder.<init>():182:182 -> builder
+    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder builder():104 -> builder
+    3:3:com.android.tools.r8.relocator.RelocatorCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):112:112 -> builder
+    4:4:void com.android.tools.r8.relocator.RelocatorCommand$Builder.<init>(com.android.tools.r8.DiagnosticsHandler):186:186 -> builder
+    4:4:com.android.tools.r8.relocator.RelocatorCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):112 -> builder
+    1:1:com.android.tools.r8.utils.AndroidApp getApp():132:132 -> getApp
+    1:1:com.android.tools.r8.ClassFileConsumer getConsumer():124:124 -> getConsumer
+    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():120:120 -> getFactory
+    1:17:com.android.tools.r8.utils.InternalOptions getInternalOptions():145:161 -> getInternalOptions
+    1:1:java.util.Map getMapping():166:166 -> getMapping
+    1:1:com.android.tools.r8.utils.Reporter getReporter():116:116 -> getReporter
+    1:1:int getThreadCount():128:128 -> getThreadCount
+    1:1:boolean isPrintHelp():136:136 -> isPrintHelp
+    1:1:boolean isPrintVersion():140:140 -> isPrintVersion
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):108:108 -> parse
 com.android.tools.r8.relocator.RelocatorCommand$1 -> com.android.tools.r8.relocator.RelocatorCommand$a:
 com.android.tools.r8.relocator.RelocatorCommand$Builder -> com.android.tools.r8.relocator.RelocatorCommand$Builder:
     com.android.tools.r8.ClassFileConsumer consumer -> d
@@ -60154,42 +61107,45 @@
     boolean $assertionsDisabled -> h
     int threadCount -> e
     com.android.tools.r8.utils.Reporter reporter -> b
-    1:1:void <clinit>():167:167 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):187:187 -> <init>
-    2:18:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):173:189 -> <init>
-    1:5:void lambda$addProgramFiles$0(java.util.Collection):244:248 -> a
-    6:6:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):312:312 -> a
-    6:6:void lambda$addProgramFiles$0(java.util.Collection):248 -> a
-    7:9:void lambda$addProgramFile$1(java.nio.file.Path):260:262 -> a
-    10:10:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):312:312 -> a
-    10:10:void lambda$addProgramFile$1(java.nio.file.Path):262 -> a
-    11:68:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):354:411 -> a
-    69:76:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):376:383 -> a
-    77:83:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):381:387 -> a
-    84:119:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):373:408 -> a
-    120:120:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):406:406 -> a
-    121:148:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):390:417 -> a
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addPackageMapping(com.android.tools.r8.references.PackageReference,com.android.tools.r8.references.PackageReference):269:269 -> addPackageMapping
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFile(java.nio.file.Path):257:257 -> addProgramFile
-    2:4:void guard(java.lang.Runnable):318:320 -> addProgramFile
-    2:4:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFile(java.nio.file.Path):257 -> addProgramFile
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.nio.file.Path[]):237:237 -> addProgramFiles
-    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.util.Collection):242:242 -> addProgramFiles
-    3:5:void guard(java.lang.Runnable):318:320 -> addProgramFiles
-    3:5:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.util.Collection):242 -> addProgramFiles
-    1:4:com.android.tools.r8.relocator.RelocatorCommand build():296:299 -> build
-    5:6:void validate():289:290 -> build
-    5:6:com.android.tools.r8.relocator.RelocatorCommand build():300 -> build
-    7:10:com.android.tools.r8.relocator.RelocatorCommand build():301:304 -> build
-    11:20:com.android.tools.r8.relocator.RelocatorCommand build():297:306 -> build
-    1:1:void error(com.android.tools.r8.Diagnostic):222:222 -> error
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):336:336 -> parse
-    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):350:350 -> parse
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setConsumer(com.android.tools.r8.ClassFileConsumer):284:284 -> setConsumer
-    1:4:com.android.tools.r8.relocator.RelocatorCommand$Builder setOutputPath(java.nio.file.Path):203:206 -> setOutputPath
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintHelp(boolean):211:211 -> setPrintHelp
-    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintVersion(boolean):216:216 -> setPrintVersion
-    1:3:com.android.tools.r8.relocator.RelocatorCommand$Builder setThreadCount(int):228:230 -> setThreadCount
+    1:1:void <clinit>():169:169 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):189:189 -> <init>
+    2:18:void <init>(com.android.tools.r8.utils.AndroidApp$Builder):175:191 -> <init>
+    1:5:void lambda$addProgramFiles$0(java.util.Collection):246:250 -> a
+    6:6:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):318:318 -> a
+    6:6:void lambda$addProgramFiles$0(java.util.Collection):250 -> a
+    7:9:void lambda$addProgramFile$1(java.nio.file.Path):262:264 -> a
+    10:10:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):318:318 -> a
+    10:10:void lambda$addProgramFile$1(java.nio.file.Path):264 -> a
+    11:15:void lambda$build$2(com.android.tools.r8.utils.Box):301:305 -> a
+    16:17:void validate():291:292 -> a
+    16:17:void lambda$build$2(com.android.tools.r8.utils.Box):306 -> a
+    18:22:void lambda$build$2(com.android.tools.r8.utils.Box):307:311 -> a
+    23:23:void lambda$build$2(com.android.tools.r8.utils.Box):309:309 -> a
+    24:24:void lambda$build$2(com.android.tools.r8.utils.Box):302:302 -> a
+    25:82:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):360:417 -> a
+    83:90:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):382:389 -> a
+    91:97:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):387:393 -> a
+    98:120:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):379:401 -> a
+    121:135:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):400:414 -> a
+    136:136:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):412:412 -> a
+    137:164:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.relocator.RelocatorCommand$Builder):396:423 -> a
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addPackageMapping(com.android.tools.r8.references.PackageReference,com.android.tools.r8.references.PackageReference):271:271 -> addPackageMapping
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFile(java.nio.file.Path):259:259 -> addProgramFile
+    2:4:void guard(java.lang.Runnable):324:326 -> addProgramFile
+    2:4:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFile(java.nio.file.Path):259 -> addProgramFile
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.nio.file.Path[]):239:239 -> addProgramFiles
+    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.util.Collection):244:244 -> addProgramFiles
+    3:5:void guard(java.lang.Runnable):324:326 -> addProgramFiles
+    3:5:com.android.tools.r8.relocator.RelocatorCommand$Builder addProgramFiles(java.util.Collection):244 -> addProgramFiles
+    1:17:com.android.tools.r8.relocator.RelocatorCommand build():297:313 -> build
+    1:1:void error(com.android.tools.r8.Diagnostic):224:224 -> error
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):342:342 -> parse
+    2:2:com.android.tools.r8.relocator.RelocatorCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):356:356 -> parse
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setConsumer(com.android.tools.r8.ClassFileConsumer):286:286 -> setConsumer
+    1:4:com.android.tools.r8.relocator.RelocatorCommand$Builder setOutputPath(java.nio.file.Path):205:208 -> setOutputPath
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintHelp(boolean):213:213 -> setPrintHelp
+    1:1:com.android.tools.r8.relocator.RelocatorCommand$Builder setPrintVersion(boolean):218:218 -> setPrintVersion
+    1:3:com.android.tools.r8.relocator.RelocatorCommand$Builder setThreadCount(int):230:232 -> setThreadCount
 com.android.tools.r8.relocator.RelocatorCommandLine -> com.android.tools.r8.relocator.a:
     1:11:void run(java.lang.String[]):31:41 -> a
 com.android.tools.r8.relocator.RelocatorDiagnostic -> com.android.tools.r8.relocator.b:
@@ -60438,8 +61394,8 @@
     java.lang.String message -> b
     int lineNumber -> a
     1:3:void <init>(int,java.lang.String):23:25 -> <init>
-    1:1:com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics createNull(int):44:44 -> createNull
-    1:2:com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics createParse(int,java.lang.String):48:49 -> createParse
+    1:1:com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics createNull(int):44:44 -> a
+    2:3:com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics createParse(int,java.lang.String):48:49 -> a
     1:1:java.lang.String getDiagnosticMessage():40:40 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():30:30 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():35:35 -> getPosition
@@ -60825,19 +61781,22 @@
     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
 com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaking.AbstractMethodRemover:
-    1:1:void <clinit>():25:25 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):31:31 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):29:33 -> <init>
-    1:1:void processClass(com.android.tools.r8.graph.DexType):42:42 -> processClass
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> processClass
-    2:2:void processClass(com.android.tools.r8.graph.DexType):42 -> processClass
-    3:11:void processClass(com.android.tools.r8.graph.DexType):43:51 -> processClass
-    12:12:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> processClass
-    12:12:void processClass(com.android.tools.r8.graph.DexType):51 -> processClass
-    13:13:void processClass(com.android.tools.r8.graph.DexType):52:52 -> processClass
-    1:17:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):61:77 -> processMethods
-    18:33:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):67:82 -> processMethods
-    1:2:void run():37:38 -> run
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):32:32 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):30:34 -> <init>
+    1:1:void processClass(com.android.tools.r8.graph.DexType):43:43 -> processClass
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> processClass
+    2:2:void processClass(com.android.tools.r8.graph.DexType):43 -> processClass
+    3:6:void processClass(com.android.tools.r8.graph.DexType):44:47 -> processClass
+    7:12:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):16:21 -> processClass
+    7:12:void processClass(com.android.tools.r8.graph.DexType):47 -> processClass
+    13:19:void processClass(com.android.tools.r8.graph.DexType):47:53 -> processClass
+    20:20:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:204 -> processClass
+    20:20:void processClass(com.android.tools.r8.graph.DexType):53 -> processClass
+    21:21:void processClass(com.android.tools.r8.graph.DexType):54:54 -> processClass
+    1:17:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):63:79 -> processMethods
+    18:33:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):69:84 -> processMethods
+    1:2:void run():38:39 -> run
 com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.shaking.AnnotationFixer:
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.GraphLense):24:25 -> <init>
@@ -60865,35 +61824,36 @@
     1:1:boolean access$000(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):27:27 -> access$000
     1:1:boolean access$100(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):27:27 -> access$100
     1:1:com.android.tools.r8.shaking.AnnotationRemover$Builder builder():48:48 -> builder
-    1:3:void clearAnnotations(com.android.tools.r8.graph.AppView):330:332 -> clearAnnotations
-    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):260:262 -> enclosingMethodPinned
+    1:3:void clearAnnotations(com.android.tools.r8.graph.AppView):331:333 -> clearAnnotations
+    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):261:263 -> enclosingMethodPinned
     1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():167:167 -> ensureValid
     1:2:boolean filterAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):57:58 -> filterAnnotations
     1:18:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):144:161 -> filterParameterAnnotations
     19:31:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):151:163 -> filterParameterAnnotations
     1:1:java.util.Set getClassesToRetainInnerClassAttributeFor():52:52 -> getClassesToRetainInnerClassAttributeFor
     1:5:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):176:180 -> hasGenericEnclosingClass
-    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):266:267 -> hasInnerClassesFromSet
+    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):267:268 -> hasInnerClassesFromSet
     1:2:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):188:189 -> hasSignatureAnnotation
     1:1:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):131:131 -> isAnnotationTypeLive
     2:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):136:137 -> isAnnotationTypeLive
     1:1:com.android.tools.r8.graph.DexAnnotation lambda$processField$2(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexAnnotation):215:215 -> lambda$processField$2
     1:1:com.android.tools.r8.graph.DexAnnotation lambda$processMethod$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):208:208 -> lambda$processMethod$1
-    1:1:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> lambda$rewriteAnnotationElement$4
+    1:1:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):256:256 -> lambda$rewriteAnnotationElement$4
     1:1:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):236:236 -> lambda$rewriteEncodedAnnotation$3
     1:1:com.android.tools.r8.graph.DexAnnotation lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):200:200 -> lambda$run$0
-    1:12:boolean lambda$stripAttributes$5(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):304:315 -> lambda$stripAttributes$5
+    1:12:boolean lambda$stripAttributes$5(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):305:316 -> lambda$stripAttributes$5
     1:1:void processField(com.android.tools.r8.graph.DexEncodedField):215:215 -> processField
     2:2:void processField(com.android.tools.r8.graph.DexEncodedField):214:214 -> processField
     1:1:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):208:208 -> processMethod
     2:5:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):207:210 -> processMethod
     1:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):220:222 -> rewriteAnnotation
     1:1:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):246:246 -> rewriteAnnotationElement
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> rewriteAnnotationElement
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> rewriteAnnotationElement
     2:2:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):246 -> rewriteAnnotationElement
-    3:6:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):252:255 -> rewriteAnnotationElement
-    1:13:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):228:240 -> rewriteEncodedAnnotation
-    14:14:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):239:239 -> rewriteEncodedAnnotation
+    3:7:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):252:256 -> rewriteAnnotationElement
+    1:9:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):228:236 -> rewriteEncodedAnnotation
+    10:15:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):235:240 -> rewriteEncodedAnnotation
+    16:16:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):239:239 -> rewriteEncodedAnnotation
     1:4:void run():197:200 -> run
     5:8:void run():199:202 -> run
     1:1:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):64:64 -> shouldKeepAnnotation
@@ -60924,141 +61884,142 @@
     35:35:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):397:397 -> shouldKeepAnnotation
     35:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):116 -> shouldKeepAnnotation
     36:36:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation,boolean):120:120 -> shouldKeepAnnotation
-    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):281:325 -> stripAttributes
-    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):293:302 -> stripAttributes
+    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):282:326 -> stripAttributes
+    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):294:303 -> stripAttributes
 com.android.tools.r8.shaking.AnnotationRemover$Builder -> com.android.tools.r8.shaking.AnnotationRemover$Builder:
-    1:1:void <clinit>():336:336 -> <clinit>
-    1:7:void <init>():336:342 -> <init>
-    1:2:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):417:418 -> build
-    1:54:com.android.tools.r8.shaking.AnnotationRemover$Builder computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):348:401 -> computeClassesToRetainInnerClassAttributeFor
-    1:1:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):412:412 -> retainAnnotation
-    1:1:com.android.tools.r8.shaking.AnnotationRemover$Builder setClassesToRetainInnerClassAttributeFor(java.util.Set):407:407 -> setClassesToRetainInnerClassAttributeFor
+    1:1:void <clinit>():337:337 -> <clinit>
+    1:7:void <init>():337:343 -> <init>
+    1:2:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):418:419 -> build
+    1:54:com.android.tools.r8.shaking.AnnotationRemover$Builder computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):349:402 -> computeClassesToRetainInnerClassAttributeFor
+    1:1:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):413:413 -> retainAnnotation
+    1:1:com.android.tools.r8.shaking.AnnotationRemover$Builder setClassesToRetainInnerClassAttributeFor(java.util.Set):408:408 -> setClassesToRetainInnerClassAttributeFor
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
-    1:1:void <clinit>():75:75 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):239:239 -> <init>
-    2:361:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):194:553 -> <init>
-    362:401:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):240:279 -> <init>
-    402:402:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):324:324 -> <init>
-    403:762:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):194:553 -> <init>
-    763:802:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):325:364 -> <init>
-    803:845:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):368:410 -> <init>
-    846:888:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):418:418 -> <init>
-    934:935:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):464:465 -> <init>
-    936:936:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):472:472 -> <init>
-    937:1296:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):194:553 -> <init>
-    1297:1337:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):473:513 -> <init>
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):759:770 -> assertNoItemRemoved
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> canUseConstClassInstructions
-    1:1:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):556 -> canUseConstClassInstructions
-    2:5:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):559:562 -> canUseConstClassInstructions
-    1:10:void computeLargestCfVersion():566:575 -> computeLargestCfVersion
-    1:27:java.util.Collection computeReachableInterfaces():599:625 -> computeReachableInterfaces
-    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1367:1367 -> computeSubtypingInfo
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):972:972 -> createRewrittenAppInfoWithLiveness
-    12:17:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):978:978 -> createRewrittenAppInfoWithLiveness
-    23:28:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):984:984 -> createRewrittenAppInfoWithLiveness
-    34:80:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):990:1036 -> createRewrittenAppInfoWithLiveness
-    1:5:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):532:536 -> definitionFor
-    6:768:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:762 -> definitionFor
-    6:768:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538 -> definitionFor
-    769:769:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):800:800 -> definitionFor
-    769:769:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):539 -> definitionFor
-    770:770:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):766:766 -> definitionFor
-    770:770:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):540 -> definitionFor
-    771:773:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):541:543 -> definitionFor
-    774:851:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:77 -> definitionFor
-    774:851:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> definitionFor
-    852:952:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:100 -> definitionFor
-    852:952:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):546 -> definitionFor
-    953:953:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):548:548 -> definitionFor
-    954:954:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):533:533 -> definitionFor
-    1:1:void disableDefinitionForAssert():523:523 -> disableDefinitionForAssert
-    1:1:void enableDefinitionForAssert():527:527 -> enableDefinitionForAssert
-    1:1:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1326:1326 -> forEachInstantiatedSubType
-    1:4:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336:1339 -> forEachInstantiatedSubTypeInChain
-    1:1:void forEachReferencedClasspathClass(java.util.function.Consumer):1260:1260 -> forEachReferencedClasspathClass
-    1:3:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1269:1269 -> forEachTypeInHierarchyOfLiveProgramClasses
-    4:39:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1279:1314 -> forEachTypeInHierarchyOfLiveProgramClasses
-    1:1:java.util.Set getDeadProtoTypes():713:713 -> getDeadProtoTypes
-    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):726:727 -> getEnumValueInfoMap
-    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumValueInfoMapCollection():721:722 -> getEnumValueInfoMapCollection
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> getFieldAccessInfoCollection
-    1:9:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1215:1223 -> getMethodTargetFromExactRuntimeInformation
-    10:24:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1221:1235 -> getMethodTargetFromExactRuntimeInformation
-    1:1:java.util.Set getMissingTypes():717:717 -> getMissingTypes
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():741:741 -> getMutableFieldAccessInfoCollection
-    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():746:746 -> getObjectAllocationInfoCollection
-    1:2:java.util.Set getPinnedItems():939:940 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():1049:1050 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):731:732 -> getSwitchMap
-    1:1:boolean hasLiveness():910:910 -> hasLiveness
-    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):926:930 -> hasPinnedInstanceInitializer
-    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):833:839 -> isFieldOnlyWrittenInMethod
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):795:805 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):809:810 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):814:825 -> isFieldWrittenByFieldPutInstruction
-    1:11:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):845:855 -> isInstanceFieldWrittenOnlyInInstanceInitializers
-    1:4:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):776:779 -> isInstantiatedDirectly
-    5:5:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> isInstantiatedDirectly
-    5:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):781 -> isInstantiatedDirectly
-    6:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):781:781 -> isInstantiatedDirectly
-    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):790:791 -> isInstantiatedDirectlyOrIndirectly
-    1:2:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):785:786 -> isInstantiatedIndirectly
-    1:2:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):904:905 -> isInstantiatedInterface
-    1:1:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1345:1345 -> isInstantiatedOrPinned
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):875:876 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):579:579 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):583:584 -> isLiveProgramType
-    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):690:690 -> isLockCandidate
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):588:595 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):921:922 -> isPinned
-    1:14:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexReference):1349:1362 -> isPinnedNotProgramOrLibraryOverride
+    1:1:void <clinit>():76:76 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):243:243 -> <init>
+    2:357:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):197:552 -> <init>
+    358:398:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):244:284 -> <init>
+    399:399:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):330:330 -> <init>
+    400:755:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):197:552 -> <init>
+    756:796:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,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,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,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,com.android.tools.r8.utils.PredicateSet,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,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):331:371 -> <init>
+    797:840:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):375:418 -> <init>
+    841:884:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):426:426 -> <init>
+    931:932:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):473:474 -> <init>
+    933:933:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):481:481 -> <init>
+    934:1289:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):197:552 -> <init>
+    1290:1331:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):482:523 -> <init>
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):758:769 -> assertNoItemRemoved
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> canUseConstClassInstructions
+    1:1:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):555 -> canUseConstClassInstructions
+    2:5:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):558:561 -> canUseConstClassInstructions
+    1:10:void computeLargestCfVersion():565:574 -> computeLargestCfVersion
+    1:27:java.util.Collection computeReachableInterfaces():598:624 -> computeReachableInterfaces
+    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1376:1376 -> computeSubtypingInfo
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):985:985 -> createRewrittenAppInfoWithLiveness
+    12:17:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):991:991 -> createRewrittenAppInfoWithLiveness
+    23:28:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):997:997 -> createRewrittenAppInfoWithLiveness
+    34:49:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):1003:1018 -> createRewrittenAppInfoWithLiveness
+    50:53:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):1017:1020 -> createRewrittenAppInfoWithLiveness
+    54:85:com.android.tools.r8.shaking.AppInfoWithLiveness createRewrittenAppInfoWithLiveness(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):1019:1050 -> createRewrittenAppInfoWithLiveness
+    1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):532:535 -> definitionFor
+    5:765:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:760 -> definitionFor
+    5:765:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):537 -> definitionFor
+    766:766:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):798:798 -> definitionFor
+    766:766:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538 -> definitionFor
+    767:767:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):764:764 -> definitionFor
+    767:767:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):539 -> definitionFor
+    768:770:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):540:542 -> definitionFor
+    771:848:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:77 -> definitionFor
+    771:848:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):543 -> definitionFor
+    849:949:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:100 -> definitionFor
+    849:949:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):545 -> definitionFor
+    950:950:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):547:547 -> definitionFor
+    951:951:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):533:533 -> definitionFor
+    1:1:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1335:1335 -> forEachInstantiatedSubType
+    1:4:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1345:1348 -> forEachInstantiatedSubTypeInChain
+    1:1:void forEachReferencedClasspathClass(java.util.function.Consumer):1269:1269 -> forEachReferencedClasspathClass
+    1:3:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1278:1278 -> forEachTypeInHierarchyOfLiveProgramClasses
+    4:39:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1288:1323 -> forEachTypeInHierarchyOfLiveProgramClasses
+    1:1:java.util.Set getDeadProtoTypes():712:712 -> getDeadProtoTypes
+    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):725:726 -> getEnumValueInfoMap
+    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumValueInfoMapCollection():720:721 -> getEnumValueInfoMapCollection
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():736:736 -> getFieldAccessInfoCollection
+    1:9:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1224:1232 -> getMethodTargetFromExactRuntimeInformation
+    10:24:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1230:1244 -> getMethodTargetFromExactRuntimeInformation
+    1:1:java.util.Set getMissingTypes():716:716 -> getMissingTypes
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():740:740 -> getMutableFieldAccessInfoCollection
+    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():745:745 -> getObjectAllocationInfoCollection
+    1:2:java.util.Set getPinnedItems():952:953 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():1063:1064 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):730:731 -> getSwitchMap
+    1:1:boolean hasLiveness():918:918 -> hasLiveness
+    1:5:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):939:943 -> hasPinnedInstanceInitializer
+    1:2:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):929:930 -> isAccessModificationAllowed
+    1:7:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):832:838 -> isFieldOnlyWrittenInMethod
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):794:804 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):808:809 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):813:824 -> isFieldWrittenByFieldPutInstruction
+    1:11:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):844:854 -> isInstanceFieldWrittenOnlyInInstanceInitializers
+    1:4:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):775:778 -> isInstantiatedDirectly
+    5:5:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> isInstantiatedDirectly
+    5:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):780 -> isInstantiatedDirectly
+    6:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):780:780 -> isInstantiatedDirectly
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):789:790 -> isInstantiatedDirectlyOrIndirectly
+    1:2:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):784:785 -> isInstantiatedIndirectly
+    1:2:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):912:913 -> isInstantiatedInterface
+    1:1:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1354:1354 -> isInstantiatedOrPinned
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):883:884 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):578:578 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):582:583 -> isLiveProgramType
+    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):689:689 -> isLockCandidate
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):587:594 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):934:935 -> isPinned
+    1:14:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexReference):1358:1371 -> isPinnedNotProgramOrLibraryOverride
     1:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):860:864 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
-    1:1:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$6(com.android.tools.r8.graph.DexType):1270:1270 -> lambda$forEachTypeInHierarchyOfLiveProgramClasses$6
-    1:1:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1281:1281 -> lambda$forEachTypeInHierarchyOfLiveProgramClasses$7
-    1:1:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):856:856 -> lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1
-    1:11:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$8(com.android.tools.r8.graph.DexProgramClass):1393:1403 -> lambda$mayHaveFinalizer$8
-    1:1:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):1407:1407 -> lambda$mayHaveFinalizer$9
-    1:1:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):896:896 -> lambda$rewriteKeysConservativelyWhileMergingValues$2
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness lambda$rewrittenWithLens$4(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):966:966 -> lambda$rewrittenWithLens$4
-    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):701:706 -> lambda$withoutStaticFieldsWrites$0
-    1:34:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):645:678 -> lookupLambdaImplementedMethods
-    35:35:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):648:648 -> lookupLambdaImplementedMethods
-    1:1:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.LibraryModeledPredicate):1085:1085 -> lookupSingleProgramTarget
-    2:2:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.LibraryModeledPredicate):1084:1084 -> lookupSingleProgramTarget
-    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,com.android.tools.r8.shaking.LibraryModeledPredicate):1058:1073 -> 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,com.android.tools.r8.shaking.LibraryModeledPredicate):1071:1071 -> 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,com.android.tools.r8.shaking.LibraryModeledPredicate):1069:1069 -> 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,com.android.tools.r8.shaking.LibraryModeledPredicate):1067:1067 -> 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,com.android.tools.r8.shaking.LibraryModeledPredicate):1065:1065 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):1091:1092 -> lookupSingleVirtualTarget
-    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1102:1103 -> lookupSingleVirtualTarget
-    5:40:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1114:1149 -> lookupSingleVirtualTarget
-    41:41:boolean com.android.tools.r8.graph.DexClass.isFinal():464:464 -> lookupSingleVirtualTarget
-    41:41:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1149 -> lookupSingleVirtualTarget
-    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> lookupSingleVirtualTarget
-    42:42:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1150 -> lookupSingleVirtualTarget
-    43:66:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1150:1173 -> lookupSingleVirtualTarget
-    67:87:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1172:1192 -> lookupSingleVirtualTarget
-    88:98:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1191:1201 -> lookupSingleVirtualTarget
-    1:13:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1372:1384 -> mayHaveFinalizeMethodDirectlyOrIndirectly
-    1:22:boolean mayHaveFinalizer(com.android.tools.r8.graph.DexType):1389:1410 -> mayHaveFinalizer
-    1:4:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):868:871 -> mayPropagateValueFor
-    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():517:517 -> modifier
-    1:1:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):751:751 -> mutateObjectAllocationInfoCollection
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):951:956 -> prunedCopyFrom
-    1:1:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):755:755 -> removeFromSingleTargetLookupCache
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):881:885 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):891:900 -> rewriteKeysConservativelyWhileMergingValues
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):961:966 -> rewrittenWithLens
-    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):965:965 -> rewrittenWithLens
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1044:1045 -> wasPruned
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1248:1250 -> withEnumValueInfoMaps
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():916:916 -> withLiveness
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1242:1244 -> withSwitchMaps
-    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):694:699 -> withoutStaticFieldsWrites
+    1:1:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$6(com.android.tools.r8.graph.DexType):1279:1279 -> lambda$forEachTypeInHierarchyOfLiveProgramClasses$6
+    1:1:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$7(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1290:1290 -> lambda$forEachTypeInHierarchyOfLiveProgramClasses$7
+    1:1:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):856:856 -> lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1
+    1:11:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$8(com.android.tools.r8.graph.DexProgramClass):1402:1412 -> lambda$mayHaveFinalizer$8
+    1:1:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):1416:1416 -> lambda$mayHaveFinalizer$9
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteKeysConservativelyWhileMergingValues$2(com.android.tools.r8.graph.PresortedComparable):904:904 -> lambda$rewriteKeysConservativelyWhileMergingValues$2
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness lambda$rewrittenWithLens$4(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):979:979 -> lambda$rewrittenWithLens$4
+    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):700:705 -> lambda$withoutStaticFieldsWrites$0
+    1:34:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):644:677 -> lookupLambdaImplementedMethods
+    35:35:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):647:647 -> lookupLambdaImplementedMethods
+    1:1:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1098:1098 -> lookupSingleProgramTarget
+    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.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1072:1087 -> 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.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1085:1085 -> 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.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1083:1083 -> 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.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1081:1081 -> 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.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1079:1079 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1104:1105 -> lookupSingleVirtualTarget
+    3:4:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1115:1116 -> lookupSingleVirtualTarget
+    5:36:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1127:1158 -> lookupSingleVirtualTarget
+    37:37:boolean com.android.tools.r8.graph.DexClass.isFinal():469:469 -> lookupSingleVirtualTarget
+    37:37:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1158 -> lookupSingleVirtualTarget
+    38:38:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> lookupSingleVirtualTarget
+    38:38:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1159 -> lookupSingleVirtualTarget
+    39:62:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1159:1182 -> lookupSingleVirtualTarget
+    63:83:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1181:1201 -> lookupSingleVirtualTarget
+    84:94:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1200:1210 -> lookupSingleVirtualTarget
+    1:13:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1381:1393 -> mayHaveFinalizeMethodDirectlyOrIndirectly
+    1:22:boolean mayHaveFinalizer(com.android.tools.r8.graph.DexType):1398:1419 -> mayHaveFinalizer
+    1:5:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):868:872 -> mayPropagateArgumentsTo
+    1:4:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):876:879 -> mayPropagateValueFor
+    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():527:527 -> modifier
+    1:1:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):750:750 -> mutateObjectAllocationInfoCollection
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Collection,java.util.Collection):964:969 -> prunedCopyFrom
+    1:1:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):754:754 -> removeFromSingleTargetLookupCache
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):889:893 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):899:908 -> rewriteKeysConservativelyWhileMergingValues
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):974:979 -> rewrittenWithLens
+    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense$NestedGraphLense):978:978 -> rewrittenWithLens
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1058:1059 -> wasPruned
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1257:1259 -> withEnumValueInfoMaps
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():924:924 -> withLiveness
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1251:1253 -> withSwitchMaps
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):693:698 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():1063:1063 -> <clinit>
+    1:1:void <clinit>():1077:1077 -> <clinit>
 com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.AppInfoWithLivenessModifier:
     1:1:void <init>():20:20 -> <init>
     2:3:void <init>():17:18 -> <init>
@@ -61073,20 +62034,20 @@
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):30:30 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):28:32 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():151:151 -> isMinimumRequiredVisibility
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():155:155 -> isMinimumRequiredVisibility
     1:1:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):82 -> isMinimumRequiredVisibility
     2:2:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):85:85 -> isMinimumRequiredVisibility
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():139:139 -> isMinimumRequiredVisibility
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():143:143 -> isMinimumRequiredVisibility
     3:3:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):89 -> isMinimumRequiredVisibility
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():147:147 -> isMinimumRequiredVisibility
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():151:151 -> isMinimumRequiredVisibility
     4:4:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):89 -> isMinimumRequiredVisibility
     5:5:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):93:93 -> isMinimumRequiredVisibility
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():147:147 -> isMinimumRequiredVisibility
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():151:151 -> isMinimumRequiredVisibility
     6:6:boolean isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):87 -> isMinimumRequiredVisibility
     1:3:void run(java.util.concurrent.ExecutorService):36:36 -> run
     5:5:void run(java.util.concurrent.ExecutorService):38:38 -> run
     1:1:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):42:42 -> synthesizeClassInitField
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> synthesizeClassInitField
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> synthesizeClassInitField
     2:2:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):42 -> synthesizeClassInitField
     3:38:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):42:77 -> synthesizeClassInitField
 com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1:
@@ -61201,542 +62162,571 @@
     1:1:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31:31 -> lambda$run$1
     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>():147:147 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):347:347 -> <init>
-    2:3027:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):175:3200 -> <init>
-    3028:3064:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):348:384 -> <init>
-    1:1:void access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):147:147 -> access$1300
-    1:1:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):147:147 -> access$1400
-    1:1:com.android.tools.r8.graph.AppView access$1500(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$1500
-    1:1:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):147:147 -> access$1600
-    1:1:com.android.tools.r8.utils.InternalOptions access$1700(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$1700
-    1:1:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):147:147 -> access$1800
-    1:1:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):147:147 -> access$1900
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$200(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$200
-    1:1:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod):147:147 -> access$2000
-    1:1:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):147:147 -> access$2100
-    1:1:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):147:147 -> access$2200
-    1:1:com.android.tools.r8.shaking.GraphReporter access$300(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$300
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$400
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$500(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$500
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$600(com.android.tools.r8.shaking.Enqueuer):147:147 -> access$600
-    1:1:void access$700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):147:147 -> access$700
-    1:1:boolean access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):147:147 -> access$800
-    1:30:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3151:3180 -> addConsequentRootSet
-    1:1:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):437:437 -> addDeadProtoTypeCandidate
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):364:364 -> <init>
+    2:3112:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):181:3291 -> <init>
+    3113:3151:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):365:403 -> <init>
+    1:1:boolean access$1000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):153:153 -> access$1000
+    1:1:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):153:153 -> access$1400
+    1:1:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):153:153 -> access$1500
+    1:1:com.android.tools.r8.graph.DexProgramClass access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):153:153 -> access$1600
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1700(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$1700
+    1:1:void access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):153:153 -> access$1800
+    1:1:com.android.tools.r8.utils.InternalOptions access$1900(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$1900
+    1:1:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):153:153 -> access$2000
+    1:1:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod):153:153 -> access$2100
+    1:1:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):153:153 -> access$2200
+    1:1:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):153:153 -> access$2300
+    1:1:com.android.tools.r8.graph.DexClass access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):153:153 -> access$2400
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode access$400(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$400
+    1:1:com.android.tools.r8.shaking.GraphReporter access$500(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$500
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$600
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$700(com.android.tools.r8.shaking.Enqueuer):153:153 -> access$700
+    1:1:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):153:153 -> access$800
+    1:1:boolean access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):153:153 -> access$900
+    1:30:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3242:3271 -> addConsequentRootSet
+    1:1:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):460:460 -> addDeadProtoTypeCandidate
     2:2:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> addDeadProtoTypeCandidate
-    2:2:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):437 -> addDeadProtoTypeCandidate
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> addDeadProtoTypeCandidate
+    2:2:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):460 -> addDeadProtoTypeCandidate
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> addDeadProtoTypeCandidate
     3:3:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):291 -> addDeadProtoTypeCandidate
-    3:3:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):437 -> addDeadProtoTypeCandidate
+    3:3:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):460 -> addDeadProtoTypeCandidate
     4:4:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):292:292 -> addDeadProtoTypeCandidate
-    4:4:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):437 -> addDeadProtoTypeCandidate
-    5:6:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):437:438 -> addDeadProtoTypeCandidate
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> addDeadProtoTypeCandidate
-    7:7:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):438 -> addDeadProtoTypeCandidate
-    8:8:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):438:438 -> addDeadProtoTypeCandidate
-    9:9:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):442:442 -> addDeadProtoTypeCandidate
-    1:10:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):500:509 -> addLiveNonProgramType
-    1:7:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):536:542 -> addNonProgramClassToWorklist
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> addNonProgramClassToWorklist
-    8:8:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):542 -> addNonProgramClassToWorklist
-    9:15:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):544:550 -> addNonProgramClassToWorklist
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():389:389 -> appInfo
-    1:16:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1913:1928 -> checkLambdaInterface
-    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.ProgramMethod):1349:1349 -> classReferencedFromReporter
-    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):663:666 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3190:3194 -> computeDelayedInterfaceMethodSyntheticBridges
-    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3193:3197 -> computeDelayedInterfaceMethodSyntheticBridges
-    1:7:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):900:906 -> computeMinimumRequiredVisibilityForInitClassField
-    1:91:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):2775:2865 -> createAppInfo
-    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():401:405 -> createUseRegistryFactory
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):488:488 -> definitionFor
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> definitionFor
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):488 -> definitionFor
-    3:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):490:494 -> definitionFor
-    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1571:1571 -> enqueueDependentItem
-    1:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):637:648 -> enqueueFirstNonSerializableClassInitializer
-    1:1:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1576:1576 -> enqueueHolderWithDependentInstanceConstructor
-    1:2:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):654:655 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):576:576 -> enqueueRootItem
-    2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):201:201 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):576 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):578:578 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):586:586 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):572:572 -> enqueueRootItems
-    1:7:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1751:1757 -> ensureFromLibraryOrThrow
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> ensureFromLibraryOrThrow
-    8:8:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1757 -> ensureFromLibraryOrThrow
-    9:42:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1758:1791 -> ensureFromLibraryOrThrow
-    1:6:void ensureLambdaAccessibility():2870:2875 -> ensureLambdaAccessibility
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1512:1515 -> ensureMethodsContinueToWidenAccess
-    5:5:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1520:1520 -> ensureMethodsContinueToWidenAccess
-    1:4:void finalizeLibraryMethodOverrideInformation():2752:2755 -> finalizeLibraryMethodOverrideInformation
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2484:2488 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2487:2492 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():397:397 -> getGraphReporter
-    1:9:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3345:3353 -> getImmediateSubtypesInInstantiatedHierarchy
-    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1353:1353 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1353 -> getInvokeSuperTarget
-    3:12:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1354:1363 -> getInvokeSuperTarget
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():393:393 -> getMode
-    1:3:long getNumberOfLiveItems():3144:3146 -> getNumberOfLiveItems
-    1:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):554:555 -> getProgramClassOrNull
-    1:1:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):1990:1990 -> getReachableVirtualTargets
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():409:409 -> getUseRegistryFactory
-    1:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3204:3224 -> handleInterfaceMethodSyntheticBridgeAction
-    22:30:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3220:3228 -> handleInterfaceMethodSyntheticBridgeAction
-    1:32:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1715:1746 -> handleInvokeOfDirectTarget
-    1:16:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1656:1671 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3550:3557 -> handleJavaLangClassNewInstance
-    9:26:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3556:3573 -> handleJavaLangClassNewInstance
-    1:5:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3729:3733 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3580:3600 -> handleJavaLangReflectConstructorNewInstance
-    22:96:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3599:3673 -> handleJavaLangReflectConstructorNewInstance
-    1:36:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3683:3718 -> handleJavaLangReflectProxyNewProxyInstance
-    1:5:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3438:3442 -> handleReflectiveBehavior
-    6:44:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3447:3485 -> handleReflectiveBehavior
-    45:45:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3484:3484 -> handleReflectiveBehavior
-    46:46:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> handleReflectiveBehavior
-    46:46:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3489 -> handleReflectiveBehavior
-    47:51:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3489:3493 -> handleReflectiveBehavior
-    52:58:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3492:3498 -> handleReflectiveBehavior
-    59:76:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3490:3507 -> handleReflectiveBehavior
-    77:77:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> handleReflectiveBehavior
-    77:77:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3507 -> handleReflectiveBehavior
-    78:83:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3516:3521 -> handleReflectiveBehavior
-    84:107:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3520:3543 -> handleReflectiveBehavior
-    108:109:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3540:3541 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3772:3784 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3739:3757 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3750:3766 -> handleServiceLoaderInvocation
-    1:3:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):591:593 -> internalEnqueueRootItem
-    4:4:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> internalEnqueueRootItem
-    4:4:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):594 -> internalEnqueueRootItem
-    5:15:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):595:605 -> internalEnqueueRootItem
-    16:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):603:607 -> internalEnqueueRootItem
-    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):603:603 -> internalEnqueueRootItem
-    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):607 -> internalEnqueueRootItem
-    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):608:619 -> internalEnqueueRootItem
-    34:45:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):616:627 -> internalEnqueueRootItem
-    46:53:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):625:632 -> internalEnqueueRootItem
-    54:54:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):630:630 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2268:2268 -> isFieldLive
-    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):2272:2273 -> isFieldRead
-    1:1:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2263:2263 -> isFieldReferenced
-    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):2278:2279 -> isFieldWrittenInMethodSatisfying
-    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):2283:2287 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):2287 -> isFieldWrittenOutsideDefaultConstructor
-    7:570:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:563 -> isFieldWrittenOutsideDefaultConstructor
-    7:570:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):2288 -> isFieldWrittenOutsideDefaultConstructor
-    571:572:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):2290:2291 -> isFieldWrittenOutsideDefaultConstructor
-    1:4:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2295:2298 -> isMemberLive
-    1:1:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2302:2302 -> isMethodLive
-    1:1:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2306:2306 -> isMethodTargeted
-    1:2:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2320:2321 -> isNonProgramTypeLive
-    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):446:446 -> isProgramClass
-    1:3:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2310:2312 -> isTypeLive
-    4:4:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2316:2316 -> isTypeLive
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3044:3049 -> joinIdentifierNameStrings
-    1:6:void lambda$addConsequentRootSet$53(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3154:3159 -> lambda$addConsequentRootSet$53
-    7:99:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> lambda$addConsequentRootSet$53
-    7:99:void lambda$addConsequentRootSet$53(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3159 -> lambda$addConsequentRootSet$53
-    100:104:void lambda$addConsequentRootSet$53(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3161:3165 -> lambda$addConsequentRootSet$53
-    105:105:void lambda$addConsequentRootSet$53(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3164:3164 -> lambda$addConsequentRootSet$53
-    1:2:void lambda$addConsequentRootSet$54(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexEncodedMember):3171:3172 -> lambda$addConsequentRootSet$54
-    1:2:void lambda$addConsequentRootSet$55(com.android.tools.r8.graph.DexType,java.util.Set):3182:3183 -> lambda$addConsequentRootSet$55
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> lambda$addConsequentRootSet$55
-    3:3:void lambda$addConsequentRootSet$55(com.android.tools.r8.graph.DexType,java.util.Set):3183 -> lambda$addConsequentRootSet$55
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> lambda$addConsequentRootSet$55
-    4:4:void lambda$addConsequentRootSet$55(com.android.tools.r8.graph.DexType,java.util.Set):3183 -> lambda$addConsequentRootSet$55
-    5:5:void lambda$addConsequentRootSet$55(com.android.tools.r8.graph.DexType,java.util.Set):3184:3184 -> lambda$addConsequentRootSet$55
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1349:1349 -> lambda$classReferencedFromReporter$16
-    1:1:boolean lambda$createAppInfo$49(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2783:2783 -> lambda$createAppInfo$49
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):403:403 -> lambda$createUseRegistryFactory$0
-    1:1:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1765:1765 -> lambda$ensureFromLibraryOrThrow$29
-    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():483:483 -> lambda$ensureFromLibraryOrThrow$29
-    2:2:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1766 -> lambda$ensureFromLibraryOrThrow$29
-    3:8:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1767:1772 -> lambda$ensureFromLibraryOrThrow$29
-    1:13:void lambda$ensureLambdaAccessibility$50(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):2877:2889 -> lambda$ensureLambdaAccessibility$50
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$24(com.android.tools.r8.graph.DexType):1514:1514 -> lambda$ensureMethodsContinueToWidenAccess$24
-    1:3:boolean lambda$ensureMethodsContinueToWidenAccess$25(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1522:1524 -> lambda$ensureMethodsContinueToWidenAccess$25
-    1:1:void lambda$ensureMethodsContinueToWidenAccess$26(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1525:1525 -> lambda$ensureMethodsContinueToWidenAccess$26
-    1:4:void lambda$markFailedResolutionTargets$47(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2475:2478 -> lambda$markFailedResolutionTargets$47
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$34(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2175:2175 -> lambda$markFieldAsTargeted$34
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$35(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2176:2176 -> lambda$markFieldAsTargeted$35
-    1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> lambda$markInstanceFieldAsLive$39
-    1:1:void lambda$markInstanceFieldAsLive$39(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2233 -> lambda$markInstanceFieldAsLive$39
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$40(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):2332:2332 -> lambda$markInstanceFieldAsReachable$40
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$41(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):2334:2334 -> lambda$markInstanceFieldAsReachable$41
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$42(com.android.tools.r8.graph.DexProgramClass):2353:2353 -> lambda$markInstanceFieldAsReachable$42
-    1:1:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$27(com.android.tools.r8.graph.DexProgramClass):1555:1555 -> lambda$markInterfaceTypeAsLiveViaInheritanceClause$27
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$33(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2090:2090 -> lambda$markLibraryOrClasspathOverrideLive$33
-    1:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$32(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2036:2036 -> lambda$markLiveOverrides$32
-    1:1:void lambda$markMethodAsLive$56(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):3383:3383 -> lambda$markMethodAsLive$56
-    1:1:void lambda$markMethodAsLive$57(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3390:3390 -> lambda$markMethodAsLive$57
-    1:1:void lambda$markMethodAsTargeted$30(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1830:1830 -> lambda$markMethodAsTargeted$30
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$59(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3402:3402 -> lambda$markParameterAndReturnTypesAsLive$59
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$60(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3406:3406 -> lambda$markParameterAndReturnTypesAsLive$60
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$58(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3395:3395 -> lambda$markReferencedTypesAsLive$58
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$36(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):2183:2183 -> lambda$markStaticFieldAsLive$36
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$37(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):2185:2185 -> lambda$markStaticFieldAsLive$37
-    1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> lambda$markStaticFieldAsLive$38
-    1:1:void lambda$markStaticFieldAsLive$38(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2214 -> lambda$markStaticFieldAsLive$38
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$48(com.android.tools.r8.graph.DexEncodedMethod):2538:2538 -> lambda$markSuperMethodAsReachable$48
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexType):1397:1397 -> lambda$markTypeAsLive$17
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$18(com.android.tools.r8.graph.DexType):1416:1416 -> lambda$markTypeAsLive$18
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$19(com.android.tools.r8.graph.DexType):1423:1423 -> lambda$markTypeAsLive$19
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$20(com.android.tools.r8.graph.DexType):1461:1461 -> lambda$markTypeAsLive$20
-    1:1:boolean lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1497:1497 -> lambda$markTypeAsLive$21
-    1:1:void lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1498:1498 -> lambda$markTypeAsLive$22
-    1:1:void lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1508:1508 -> lambda$markTypeAsLive$23
-    1:1:java.util.Set lambda$markVirtualMethodAsReachable$43(com.android.tools.r8.graph.DexProgramClass):2425:2425 -> lambda$markVirtualMethodAsReachable$43
-    1:1:void lambda$markVirtualMethodAsReachable$44(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2432:2432 -> lambda$markVirtualMethodAsReachable$44
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2440:2440 -> lambda$markVirtualMethodAsReachable$45
-    1:1:void lambda$markVirtualMethodAsReachable$46(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2437:2437 -> lambda$markVirtualMethodAsReachable$46
-    1:1:java.util.Set lambda$processAnnotation$28(com.android.tools.r8.graph.DexType):1608:1608 -> lambda$processAnnotation$28
-    1:1:void lambda$processNewlyInstantiatedClass$31(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1861:1861 -> lambda$processNewlyInstantiatedClass$31
-    1:1:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):961:961 -> lambda$registerDeferredActionForDeadProtoBuilder$6
-    1:1:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):960:960 -> lambda$registerDeferredActionForDeadProtoBuilder$7
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):678:678 -> lambda$registerMethodWithTargetAndContext$2
-    1:1:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):679:679 -> lambda$registerMethodWithTargetAndContext$3
-    1:1:java.util.Set lambda$trace$51(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3074:3074 -> lambda$trace$51
-    1:1:void lambda$trace$52(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3106:3106 -> lambda$trace$52
-    1:1:java.util.Map lambda$traceCallSite$4(com.android.tools.r8.graph.DexEncodedMethod):769:769 -> lambda$traceCallSite$4
-    1:1:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):944:944 -> lambda$traceInvokeDirect$5
-    1:1:void lambda$traceInvokeDirect$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):981:981 -> lambda$traceInvokeDirect$8
-    1:1:void lambda$traceInvokeInterface$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1003:1003 -> lambda$traceInvokeInterface$9
-    1:1:void lambda$traceInvokeStatic$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1044:1044 -> lambda$traceInvokeStatic$10
-    1:1:void lambda$traceInvokeSuper$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1059:1059 -> lambda$traceInvokeSuper$11
-    1:1:void lambda$traceInvokeVirtual$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1090:1090 -> lambda$traceInvokeVirtual$12
-    1:1:void lambda$traceNewInstance$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1097:1097 -> lambda$traceNewInstance$13
-    1:1:java.lang.Boolean lambda$traceStaticFieldRead$14(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1269:1269 -> lambda$traceStaticFieldRead$14
-    1:1:java.lang.Boolean lambda$traceStaticFieldWrite$15(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1328:1328 -> lambda$traceStaticFieldWrite$15
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> markClassAsInstantiatedWithCompatRule
-    1:1:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3418 -> markClassAsInstantiatedWithCompatRule
-    2:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3419:3428 -> markClassAsInstantiatedWithCompatRule
-    12:12:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3426:3426 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3410:3412 -> markClassAsInstantiatedWithReason
-    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():563:563 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3412 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3412:3412 -> markClassAsInstantiatedWithReason
-    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1676:1676 -> markDirectAndIndirectClassInitializersAsLive
+    4:4:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):460 -> addDeadProtoTypeCandidate
+    5:6:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):460:461 -> addDeadProtoTypeCandidate
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> addDeadProtoTypeCandidate
+    7:7:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):461 -> addDeadProtoTypeCandidate
+    8:8:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):461:461 -> addDeadProtoTypeCandidate
+    9:9:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):465:465 -> addDeadProtoTypeCandidate
+    1:10:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):550:559 -> addLiveNonProgramType
+    1:7:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):586:592 -> addNonProgramClassToWorklist
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> addNonProgramClassToWorklist
+    8:8:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):592 -> addNonProgramClassToWorklist
+    9:15:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):594:600 -> addNonProgramClassToWorklist
+    1:2:boolean addPinnedItem(com.android.tools.r8.graph.DexReference):2640:2641 -> addPinnedItem
+    3:19:boolean addPinnedItem(com.android.tools.r8.graph.DexReference,java.util.Set):2645:2661 -> addPinnedItem
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():407:407 -> appInfo
+    1:16:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1958:1973 -> checkLambdaInterface
+    1:1:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.ProgramMethod):1396:1396 -> classReferencedFromReporter
+    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):712:715 -> compatEnqueueHolderIfDependentNonStaticMember
+    1:5:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3281:3285 -> computeDelayedInterfaceMethodSyntheticBridges
+    6:10:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3284:3288 -> computeDelayedInterfaceMethodSyntheticBridges
+    1:7:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):942:948 -> computeMinimumRequiredVisibilityForInitClassField
+    1:98:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):2843:2940 -> createAppInfo
+    1:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():419:423 -> createUseRegistryFactory
+    1:7:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):511:517 -> definitionFor
+    8:12:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):522:526 -> definitionFor
+    13:17:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):530:534 -> definitionFor
+    18:18:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538:538 -> definitionFor
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> definitionFor
+    19:19:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538 -> definitionFor
+    20:24:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):540:544 -> definitionFor
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1618:1618 -> enqueueDependentItem
+    1:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):686:697 -> enqueueFirstNonSerializableClassInitializer
+    1:1:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.Set):1623:1623 -> enqueueHolderWithDependentInstanceConstructor
+    1:2:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):703:704 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueRootItem(java.util.Map$Entry):626:626 -> enqueueRootItem
+    2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):231:231 -> enqueueRootItem
+    2:2:void enqueueRootItem(java.util.Map$Entry):626 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):628:628 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):636:636 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):622:622 -> enqueueRootItems
+    1:7:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1796:1802 -> ensureFromLibraryOrThrow
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> ensureFromLibraryOrThrow
+    8:8:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1802 -> ensureFromLibraryOrThrow
+    9:42:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1803:1836 -> ensureFromLibraryOrThrow
+    1:6:void ensureLambdaAccessibility():2945:2950 -> ensureLambdaAccessibility
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1559:1562 -> ensureMethodsContinueToWidenAccess
+    5:5:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1567:1567 -> ensureMethodsContinueToWidenAccess
+    1:4:void finalizeLibraryMethodOverrideInformation():2820:2823 -> finalizeLibraryMethodOverrideInformation
+    1:1:void forAllLiveClasses(java.util.function.Consumer):2358:2358 -> forAllLiveClasses
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2514:2518 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2517:2522 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():415:415 -> getGraphReporter
+    1:9:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3435:3443 -> getImmediateSubtypesInInstantiatedHierarchy
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1400:1400 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1400 -> getInvokeSuperTarget
+    3:12:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1401:1410 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():411:411 -> getMode
+    1:3:long getNumberOfLiveItems():3235:3237 -> getNumberOfLiveItems
+    1:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):604:605 -> getProgramClassOrNull
+    1:1:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2035:2035 -> getReachableVirtualTargets
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():427:427 -> getUseRegistryFactory
+    1:21:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3295:3315 -> handleInterfaceMethodSyntheticBridgeAction
+    22:30:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3311:3319 -> handleInterfaceMethodSyntheticBridgeAction
+    1:32:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1760:1791 -> handleInvokeOfDirectTarget
+    1:16:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1701:1716 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3640:3647 -> handleJavaLangClassNewInstance
+    9:26:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3646:3663 -> handleJavaLangClassNewInstance
+    1:5:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3819:3823 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3670:3690 -> handleJavaLangReflectConstructorNewInstance
+    22:96:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3689:3763 -> handleJavaLangReflectConstructorNewInstance
+    1:36:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3773:3808 -> handleJavaLangReflectProxyNewProxyInstance
+    1:5:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3528:3532 -> handleReflectiveBehavior
+    6:44:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3537:3575 -> handleReflectiveBehavior
+    45:45:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3574:3574 -> handleReflectiveBehavior
+    46:46:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> handleReflectiveBehavior
+    46:46:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3579 -> handleReflectiveBehavior
+    47:51:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3579:3583 -> handleReflectiveBehavior
+    52:58:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3582:3588 -> handleReflectiveBehavior
+    59:76:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3580:3597 -> handleReflectiveBehavior
+    77:77:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> handleReflectiveBehavior
+    77:77:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3607 -> handleReflectiveBehavior
+    78:82:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3607:3611 -> handleReflectiveBehavior
+    83:106:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3610:3633 -> handleReflectiveBehavior
+    107:108:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3630:3631 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):3862:3874 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3829:3847 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3840:3856 -> handleServiceLoaderInvocation
+    1:3:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):641:643 -> internalEnqueueRootItem
+    4:4:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> internalEnqueueRootItem
+    4:4:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):644 -> internalEnqueueRootItem
+    5:15:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):645:655 -> internalEnqueueRootItem
+    16:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):653:657 -> internalEnqueueRootItem
+    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):608:608 -> internalEnqueueRootItem
+    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):657 -> internalEnqueueRootItem
+    22:32:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):658:668 -> internalEnqueueRootItem
+    33:43:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):666:676 -> internalEnqueueRootItem
+    44:51:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):674:681 -> internalEnqueueRootItem
+    52:52:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):679:679 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2302:2302 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2306:2307 -> isFieldRead
+    1:1:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2297:2297 -> isFieldReferenced
+    1:2:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2312:2313 -> isFieldWrittenInMethodSatisfying
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2317:2321 -> isFieldWrittenOutsideDefaultConstructor
+    6:574:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:568 -> isFieldWrittenOutsideDefaultConstructor
+    6:574:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2321 -> isFieldWrittenOutsideDefaultConstructor
+    575:576:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2323:2324 -> isFieldWrittenOutsideDefaultConstructor
+    1:4:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2328:2331 -> isMemberLive
+    1:1:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2335:2335 -> isMethodLive
+    1:1:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2339:2339 -> isMethodTargeted
+    1:1:boolean isMissing(com.android.tools.r8.graph.DexType):2665:2665 -> isMissing
+    1:2:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2353:2354 -> isNonProgramTypeLive
+    1:1:boolean isPinned(com.android.tools.r8.graph.DexReference):2636:2636 -> isPinned
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):469:469 -> isProgramClass
+    1:3:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2343:2345 -> isTypeLive
+    4:4:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2349:2349 -> isTypeLive
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3135:3140 -> joinIdentifierNameStrings
+    1:6:void lambda$addConsequentRootSet$55(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3245:3250 -> lambda$addConsequentRootSet$55
+    7:99:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> lambda$addConsequentRootSet$55
+    7:99:void lambda$addConsequentRootSet$55(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3250 -> lambda$addConsequentRootSet$55
+    100:104:void lambda$addConsequentRootSet$55(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3252:3256 -> lambda$addConsequentRootSet$55
+    105:105:void lambda$addConsequentRootSet$55(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3255:3255 -> lambda$addConsequentRootSet$55
+    1:2:void lambda$addConsequentRootSet$56(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexEncodedMember):3262:3263 -> lambda$addConsequentRootSet$56
+    1:2:void lambda$addConsequentRootSet$57(com.android.tools.r8.graph.DexType,java.util.Set):3273:3274 -> lambda$addConsequentRootSet$57
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> lambda$addConsequentRootSet$57
+    3:3:void lambda$addConsequentRootSet$57(com.android.tools.r8.graph.DexType,java.util.Set):3274 -> lambda$addConsequentRootSet$57
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> lambda$addConsequentRootSet$57
+    4:4:void lambda$addConsequentRootSet$57(com.android.tools.r8.graph.DexType,java.util.Set):3274 -> lambda$addConsequentRootSet$57
+    5:5:void lambda$addConsequentRootSet$57(com.android.tools.r8.graph.DexType,java.util.Set):3275:3275 -> lambda$addConsequentRootSet$57
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$16(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1396:1396 -> lambda$classReferencedFromReporter$16
+    1:1:boolean lambda$createAppInfo$49(java.util.Map$Entry):2846:2846 -> lambda$createAppInfo$49
+    1:1:boolean lambda$createAppInfo$50(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2854:2854 -> lambda$createAppInfo$50
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):421:421 -> lambda$createUseRegistryFactory$0
+    1:1:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1810:1810 -> lambda$ensureFromLibraryOrThrow$29
+    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():488:488 -> lambda$ensureFromLibraryOrThrow$29
+    2:2:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1811 -> lambda$ensureFromLibraryOrThrow$29
+    3:8:void lambda$ensureFromLibraryOrThrow$29(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):1812:1817 -> lambda$ensureFromLibraryOrThrow$29
+    1:13:void lambda$ensureLambdaAccessibility$51(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):2952:2964 -> lambda$ensureLambdaAccessibility$51
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$24(com.android.tools.r8.graph.DexType):1561:1561 -> lambda$ensureMethodsContinueToWidenAccess$24
+    1:3:boolean lambda$ensureMethodsContinueToWidenAccess$25(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1569:1571 -> lambda$ensureMethodsContinueToWidenAccess$25
+    1:1:void lambda$ensureMethodsContinueToWidenAccess$26(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1572:1572 -> lambda$ensureMethodsContinueToWidenAccess$26
+    1:4:void lambda$markFailedResolutionTargets$46(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2505:2508 -> lambda$markFailedResolutionTargets$46
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$35(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2219:2219 -> lambda$markFieldAsTargeted$35
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$36(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2220:2220 -> lambda$markFieldAsTargeted$36
+    1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.ProgramField):0:0 -> lambda$markInstanceFieldAsLive$39
+    1:1:void lambda$markInstanceFieldAsLive$39(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2267 -> lambda$markInstanceFieldAsLive$39
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$40(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2370:2370 -> lambda$markInstanceFieldAsReachable$40
+    1:1:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$41(com.android.tools.r8.graph.DexProgramClass):2384:2384 -> lambda$markInstanceFieldAsReachable$41
+    1:1:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$27(com.android.tools.r8.graph.DexProgramClass):1602:1602 -> lambda$markInterfaceTypeAsLiveViaInheritanceClause$27
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$33(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2135:2135 -> lambda$markLibraryOrClasspathOverrideLive$33
+    1:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$32(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2081:2081 -> lambda$markLiveOverrides$32
+    1:1:void lambda$markMethodAsLive$58(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):3473:3473 -> lambda$markMethodAsLive$58
+    1:1:void lambda$markMethodAsLive$59(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3480:3480 -> lambda$markMethodAsLive$59
+    1:1:void lambda$markMethodAsTargeted$30(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1875:1875 -> lambda$markMethodAsTargeted$30
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$61(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3492:3492 -> lambda$markParameterAndReturnTypesAsLive$61
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$62(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3496:3496 -> lambda$markParameterAndReturnTypesAsLive$62
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$60(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3485:3485 -> lambda$markReferencedTypesAsLive$60
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$37(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2228:2228 -> lambda$markStaticFieldAsLive$37
+    1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.ProgramField):0:0 -> lambda$markStaticFieldAsLive$38
+    1:1:void lambda$markStaticFieldAsLive$38(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2251 -> lambda$markStaticFieldAsLive$38
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$47(com.android.tools.r8.graph.DexEncodedMethod):2568:2568 -> lambda$markSuperMethodAsReachable$47
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$17(com.android.tools.r8.graph.DexType):1444:1444 -> lambda$markTypeAsLive$17
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$18(com.android.tools.r8.graph.DexType):1463:1463 -> lambda$markTypeAsLive$18
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$19(com.android.tools.r8.graph.DexType):1470:1470 -> lambda$markTypeAsLive$19
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$20(com.android.tools.r8.graph.DexType):1508:1508 -> lambda$markTypeAsLive$20
+    1:1:boolean lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1544:1544 -> lambda$markTypeAsLive$21
+    1:1:void lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1545:1545 -> lambda$markTypeAsLive$22
+    1:1:void lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1555:1555 -> lambda$markTypeAsLive$23
+    1:1:java.util.Set lambda$markVirtualMethodAsReachable$42(com.android.tools.r8.graph.DexProgramClass):2455:2455 -> lambda$markVirtualMethodAsReachable$42
+    1:1:void lambda$markVirtualMethodAsReachable$43(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2462:2462 -> lambda$markVirtualMethodAsReachable$43
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$44(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2470:2470 -> lambda$markVirtualMethodAsReachable$44
+    1:1:void lambda$markVirtualMethodAsReachable$45(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2467:2467 -> lambda$markVirtualMethodAsReachable$45
+    1:1:java.util.Set lambda$processAnnotation$28(com.android.tools.r8.graph.DexType):1655:1655 -> lambda$processAnnotation$28
+    1:1:void lambda$processNewlyInstantiatedClass$31(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1906:1906 -> lambda$processNewlyInstantiatedClass$31
+    1:1:boolean lambda$registerDeferredActionForDeadProtoBuilder$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1003:1003 -> lambda$registerDeferredActionForDeadProtoBuilder$6
+    1:1:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$7(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1002:1002 -> lambda$registerDeferredActionForDeadProtoBuilder$7
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):727:727 -> lambda$registerMethodWithTargetAndContext$2
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):728:728 -> lambda$registerMethodWithTargetAndContext$3
+    1:1:java.util.Set lambda$trace$53(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3165:3165 -> lambda$trace$53
+    1:1:void lambda$trace$54(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3197:3197 -> lambda$trace$54
+    1:1:void lambda$traceApplication$48(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2626:2626 -> lambda$traceApplication$48
+    1:1:java.util.Map lambda$traceCallSite$4(com.android.tools.r8.graph.DexEncodedMethod):811:811 -> lambda$traceCallSite$4
+    1:1:void lambda$traceInvokeDirect$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):986:986 -> lambda$traceInvokeDirect$5
+    1:1:void lambda$traceInvokeDirect$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1023:1023 -> lambda$traceInvokeDirect$8
+    1:1:void lambda$traceInvokeInterface$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1045:1045 -> lambda$traceInvokeInterface$9
+    1:1:void lambda$traceInvokeStatic$10(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1086:1086 -> lambda$traceInvokeStatic$10
+    1:1:void lambda$traceInvokeSuper$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1101:1101 -> lambda$traceInvokeSuper$11
+    1:1:void lambda$traceInvokeVirtual$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1132:1132 -> lambda$traceInvokeVirtual$12
+    1:1:void lambda$traceNewInstance$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1139:1139 -> lambda$traceNewInstance$13
+    1:1:java.lang.Boolean lambda$traceStaticFieldRead$14(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1317:1317 -> lambda$traceStaticFieldRead$14
+    1:1:java.lang.Boolean lambda$traceStaticFieldWrite$15(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1376:1376 -> lambda$traceStaticFieldWrite$15
+    1:1:void lambda$transitionFieldsForInstantiatedClass$34(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramField):2175:2175 -> lambda$transitionFieldsForInstantiatedClass$34
+    1:5:void lambda$verifyMissingTypes$52(com.android.tools.r8.graph.DexType):2976:2976 -> lambda$verifyMissingTypes$52
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> markClassAsInstantiatedWithCompatRule
+    1:1:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3508 -> markClassAsInstantiatedWithCompatRule
+    2:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3509:3518 -> markClassAsInstantiatedWithCompatRule
+    12:12:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3516:3516 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3500:3502 -> markClassAsInstantiatedWithReason
+    4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():568:568 -> markClassAsInstantiatedWithReason
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3502 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3502:3502 -> markClassAsInstantiatedWithReason
+    1:1:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1721:1721 -> 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):1677 -> markDirectAndIndirectClassInitializersAsLive
-    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1678:1690 -> markDirectAndIndirectClassInitializersAsLive
-    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1698:1704 -> markDirectClassInitializerAsLive
-    1:9:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2237:2245 -> markDirectStaticOrConstructorMethodAsLive
+    2:3:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1722 -> markDirectAndIndirectClassInitializersAsLive
+    4:16:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1723:1735 -> markDirectAndIndirectClassInitializersAsLive
+    1:7:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1743:1749 -> markDirectClassInitializerAsLive
+    1:9:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2271:2279 -> markDirectStaticOrConstructorMethodAsLive
     10:10:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markDirectStaticOrConstructorMethodAsLive
-    10:10:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2245 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2496:2502 -> markEnumValuesAsReachable
-    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2472:2473 -> markFailedResolutionTargets
-    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):3285:3289 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2175:2176 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2219:2224 -> 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.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2224 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2226:2233 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2326:2328 -> 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):2328 -> markInstanceFieldAsReachable
-    5:22:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2331:2348 -> markInstanceFieldAsReachable
-    23:115:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> markInstanceFieldAsReachable
-    23:115:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2348 -> markInstanceFieldAsReachable
-    116:121:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2349:2354 -> markInstanceFieldAsReachable
-    1:2:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1889:1890 -> markInstantiatedClass
-    1:1:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1895:1895 -> markInterfaceAsInstantiated
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> markInterfaceAsInstantiated
-    2:2:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1895 -> markInterfaceAsInstantiated
-    3:9:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1895:1901 -> markInterfaceAsInstantiated
-    1:31:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1530:1560 -> markInterfaceTypeAsLiveViaInheritanceClause
-    32:32:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1536:1536 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:3:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):1906:1908 -> markLambdaAsInstantiated
-    1:13:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2043:2055 -> markLibraryAndClasspathMethodOverridesAsLive
-    14:26:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2054:2066 -> markLibraryAndClasspathMethodOverridesAsLive
-    27:33:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2065:2071 -> markLibraryAndClasspathMethodOverridesAsLive
-    34:34:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2068:2068 -> markLibraryAndClasspathMethodOverridesAsLive
-    1:16:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2080:2095 -> markLibraryOrClasspathOverrideLive
-    17:17:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2094:2094 -> markLibraryOrClasspathOverrideLive
-    1:5:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2019:2023 -> markLiveOverrides
-    6:6:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2022:2022 -> markLiveOverrides
-    7:18:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2020:2031 -> markLiveOverrides
-    19:21:com.android.tools.r8.graph.LookupTarget com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult.lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):518:520 -> markLiveOverrides
-    19:21:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2031 -> markLiveOverrides
-    22:22:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2033:2033 -> markLiveOverrides
-    1:24:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3250:3273 -> markMethodAsKept
-    25:33:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3271:3279 -> markMethodAsKept
-    1:14:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3361:3374 -> markMethodAsLive
+    10:10:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2279 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2526:2532 -> markEnumValuesAsReachable
+    1:2:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2502:2503 -> markFailedResolutionTargets
+    1:1:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3376:3376 -> markFieldAsKept
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> markFieldAsKept
+    2:2:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3376 -> markFieldAsKept
+    3:5:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3377:3379 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2219:2220 -> markFieldAsTargeted
+    1:4:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2255:2258 -> markInstanceFieldAsLive
+    5:5:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsLive
+    5:5:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2258 -> markInstanceFieldAsLive
+    6:13:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2260:2267 -> markInstanceFieldAsLive
+    1:2:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2363:2364 -> markInstanceFieldAsReachable
+    3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsReachable
+    3:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2364 -> markInstanceFieldAsReachable
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2368:2368 -> markInstanceFieldAsReachable
+    5:8:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2367:2370 -> markInstanceFieldAsReachable
+    9:16:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2369:2376 -> markInstanceFieldAsReachable
+    17:17:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> markInstanceFieldAsReachable
+    17:17:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2376 -> markInstanceFieldAsReachable
+    18:20:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2377:2379 -> markInstanceFieldAsReachable
+    21:113:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> markInstanceFieldAsReachable
+    21:113:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2378 -> markInstanceFieldAsReachable
+    114:119:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2380:2385 -> markInstanceFieldAsReachable
+    1:2:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1934:1935 -> markInstantiatedClass
+    1:1:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1940:1940 -> markInterfaceAsInstantiated
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> markInterfaceAsInstantiated
+    2:2:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1940 -> markInterfaceAsInstantiated
+    3:9:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1940:1946 -> markInterfaceAsInstantiated
+    1:31:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1577:1607 -> markInterfaceTypeAsLiveViaInheritanceClause
+    32:32:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1583:1583 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:3:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):1951:1953 -> markLambdaAsInstantiated
+    1:13:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2088:2100 -> markLibraryAndClasspathMethodOverridesAsLive
+    14:26:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2099:2111 -> markLibraryAndClasspathMethodOverridesAsLive
+    27:33:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2110:2116 -> markLibraryAndClasspathMethodOverridesAsLive
+    34:34:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2113:2113 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:16:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2125:2140 -> markLibraryOrClasspathOverrideLive
+    17:17:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2139:2139 -> markLibraryOrClasspathOverrideLive
+    1:5:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2064:2068 -> markLiveOverrides
+    6:6:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2067:2067 -> markLiveOverrides
+    7:18:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2065:2076 -> markLiveOverrides
+    19:21:com.android.tools.r8.graph.LookupTarget com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult.lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):523:525 -> markLiveOverrides
+    19:21:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2076 -> markLiveOverrides
+    22:22:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2078:2078 -> markLiveOverrides
+    1:24:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3341:3364 -> markMethodAsKept
+    25:33:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3362:3370 -> markMethodAsKept
+    1:14:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3451:3464 -> markMethodAsLive
     15:15:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    15:15:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3374 -> markMethodAsLive
-    16:30:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3376:3390 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3434:3434 -> markMethodAsLiveWithCompatRule
-    1:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1821:1833 -> markMethodAsTargeted
+    15:15:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3464 -> markMethodAsLive
+    16:30:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3466:3480 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3524:3524 -> markMethodAsLiveWithCompatRule
+    1:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1866:1878 -> markMethodAsTargeted
     14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
-    14:14:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1833 -> markMethodAsTargeted
-    15:19:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1835:1839 -> markMethodAsTargeted
-    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1711:1711 -> markNonStaticDirectMethodAsReachable
-    1:16:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2101:2116 -> markOverridesAsLibraryMethodOverrides
-    17:21:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):649:653 -> markOverridesAsLibraryMethodOverrides
-    17:21:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2116 -> markOverridesAsLibraryMethodOverrides
-    1:1:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3400:3400 -> markParameterAndReturnTypesAsLive
-    2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexEncodedMethod.parameters():261:261 -> markParameterAndReturnTypesAsLive
-    2:2:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3400 -> markParameterAndReturnTypesAsLive
-    3:8:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3400:3405 -> markParameterAndReturnTypesAsLive
-    9:9:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3404:3404 -> markParameterAndReturnTypesAsLive
-    1:10:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.Set):1997:2006 -> markProgramMethodOverridesAsLive
-    11:11:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2005:2005 -> markProgramMethodOverridesAsLive
-    1:1:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3395:3395 -> markReferencedTypesAsLive
-    2:4:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3394:3396 -> markReferencedTypesAsLive
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2181:2199 -> 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):2199 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2202:2203 -> 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):2203 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2207:2214 -> markStaticFieldAsLive
-    1:10:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2508:2517 -> markSuperMethodAsReachable
-    11:31:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2515:2535 -> markSuperMethodAsReachable
+    14:14:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1878 -> markMethodAsTargeted
+    15:19:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1880:1884 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1756:1756 -> markNonStaticDirectMethodAsReachable
+    1:16:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2146:2161 -> markOverridesAsLibraryMethodOverrides
+    17:21:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):654:658 -> markOverridesAsLibraryMethodOverrides
+    17:21:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2161 -> markOverridesAsLibraryMethodOverrides
+    1:6:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3490:3495 -> markParameterAndReturnTypesAsLive
+    7:7:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3494:3494 -> markParameterAndReturnTypesAsLive
+    1:10:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2042:2051 -> markProgramMethodOverridesAsLive
+    11:11:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2050:2050 -> markProgramMethodOverridesAsLive
+    1:1:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3485:3485 -> markReferencedTypesAsLive
+    2:4:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3484:3486 -> markReferencedTypesAsLive
+    1:1:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2226:2226 -> markStaticFieldAsLive
+    2:5:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2225:2228 -> markStaticFieldAsLive
+    6:14:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2227:2235 -> markStaticFieldAsLive
+    15:15:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> markStaticFieldAsLive
+    15:15:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2235 -> markStaticFieldAsLive
+    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2236:2237 -> markStaticFieldAsLive
+    18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
+    18:18:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2237 -> markStaticFieldAsLive
+    19:20:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2240:2241 -> markStaticFieldAsLive
+    21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
+    21:21:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2241 -> markStaticFieldAsLive
+    22:29:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2244:2251 -> markStaticFieldAsLive
+    1:10:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2538:2547 -> markSuperMethodAsReachable
+    11:31:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2545:2565 -> markSuperMethodAsReachable
     32:32:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    32:32:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2535 -> markSuperMethodAsReachable
-    33:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2537:2543 -> markSuperMethodAsReachable
-    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1383:1398 -> markTypeAsLive
-    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1395:1395 -> markTypeAsLive
-    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1402:1417 -> markTypeAsLive
-    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1414:1414 -> markTypeAsLive
-    35:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1421:1421 -> markTypeAsLive
-    39:59:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1429:1449 -> markTypeAsLive
+    32:32:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2565 -> markSuperMethodAsReachable
+    33:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2567:2573 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1430:1445 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1442:1442 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1449:1464 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1461:1461 -> markTypeAsLive
+    35:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1468:1468 -> markTypeAsLive
+    39:59:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1476:1496 -> markTypeAsLive
     60:60:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
-    60:60:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1449 -> markTypeAsLive
-    61:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1452:1491 -> markTypeAsLive
-    101:101:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> markTypeAsLive
-    101:101:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1494 -> markTypeAsLive
-    102:113:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1495:1506 -> markTypeAsLive
-    114:117:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1505:1508 -> markTypeAsLive
-    1:5:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2446:2450 -> markVirtualDispatchTargetAsLive
-    6:8:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2456:2458 -> markVirtualDispatchTargetAsLive
-    9:11:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2464:2466 -> markVirtualDispatchTargetAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2250:2254 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2252:2257 -> markVirtualMethodAsLive
+    60:60:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1496 -> markTypeAsLive
+    61:100:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1499:1538 -> markTypeAsLive
+    101:101:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> markTypeAsLive
+    101:101:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1541 -> markTypeAsLive
+    102:113:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1542:1553 -> markTypeAsLive
+    114:117:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1552:1555 -> markTypeAsLive
+    1:5:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2476:2480 -> markVirtualDispatchTargetAsLive
+    6:8:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2486:2488 -> markVirtualDispatchTargetAsLive
+    9:11:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2494:2496 -> markVirtualDispatchTargetAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2284:2288 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2286:2291 -> 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.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2257 -> markVirtualMethodAsLive
-    1:41:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2361:2401 -> markVirtualMethodAsReachable
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2291 -> markVirtualMethodAsLive
+    1:41:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2391:2431 -> markVirtualMethodAsReachable
     42:42:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    42:42:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2401 -> markVirtualMethodAsReachable
-    43:72:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2406:2435 -> markVirtualMethodAsReachable
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():568:568 -> newSetWithoutReasonReporter
-    1:3:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1597:1597 -> processAnnotation
-    5:8:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1599:1602 -> processAnnotation
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> processAnnotation
-    9:9:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1602 -> processAnnotation
-    10:23:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1603:1616 -> processAnnotation
-    1:1:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1580:1580 -> processAnnotations
-    2:2:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1585:1585 -> processAnnotations
-    3:4:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1590:1591 -> processAnnotations
-    1:18:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):514:531 -> processNewLiveNonProgramType
-    1:1:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1854:1854 -> processNewlyInstantiatedClass
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> processNewlyInstantiatedClass
-    2:2:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1854 -> processNewlyInstantiatedClass
-    3:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1854:1868 -> processNewlyInstantiatedClass
+    42:42:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2431 -> markVirtualMethodAsReachable
+    43:71:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2436:2464 -> markVirtualMethodAsReachable
+    72:79:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2458:2465 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():618:618 -> newSetWithoutReasonReporter
+    1:3:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1644:1644 -> processAnnotation
+    5:8:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1646:1649 -> processAnnotation
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> processAnnotation
+    9:9:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1649 -> processAnnotation
+    10:23:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1650:1663 -> processAnnotation
+    1:1:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1627:1627 -> processAnnotations
+    2:2:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1632:1632 -> processAnnotations
+    3:4:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1637:1638 -> processAnnotations
+    1:18:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):564:581 -> processNewLiveNonProgramType
+    1:1:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1899:1899 -> processNewlyInstantiatedClass
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> processNewlyInstantiatedClass
+    2:2:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1899 -> processNewlyInstantiatedClass
+    3:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1899:1913 -> processNewlyInstantiatedClass
     18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> processNewlyInstantiatedClass
-    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1868 -> processNewlyInstantiatedClass
-    19:28:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1871:1880 -> processNewlyInstantiatedClass
-    1:2:void recordFieldReference(com.android.tools.r8.graph.DexField):483:484 -> recordFieldReference
-    1:4:void recordMethodReference(com.android.tools.r8.graph.DexMethod):475:478 -> recordMethodReference
-    1:7:void recordReference(com.android.tools.r8.graph.DexReference):450:456 -> recordReference
-    1:8:void recordTypeReference(com.android.tools.r8.graph.DexType):464:471 -> recordTypeReference
-    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):413:413 -> registerAnalysis
-    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):956:962 -> registerDeferredActionForDeadProtoBuilder
-    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):958:958 -> registerDeferredActionForDeadProtoBuilder
-    1:32:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):713:744 -> registerFieldAccess
-    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):686:686 -> registerFieldRead
-    1:1:boolean registerFieldReadFromAnnotation(com.android.tools.r8.graph.DexField):690:690 -> registerFieldReadFromAnnotation
-    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):698:698 -> registerFieldWrite
-    1:1:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):418:418 -> registerInvokeAnalysis
-    1:5:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):676:680 -> registerMethodWithTargetAndContext
-    1:2:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):706:707 -> registerReflectiveFieldAccess
-    1:1:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):694:694 -> registerReflectiveFieldRead
-    1:1:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):702:702 -> registerReflectiveFieldWrite
-    1:5:void reportMissingClass(com.android.tools.r8.graph.DexType):1797:1797 -> reportMissingClass
-    9:12:void reportMissingClass(com.android.tools.r8.graph.DexType):1801:1804 -> reportMissingClass
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1913 -> processNewlyInstantiatedClass
+    19:28:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1916:1925 -> processNewlyInstantiatedClass
+    1:2:void recordFieldReference(com.android.tools.r8.graph.DexField):506:507 -> recordFieldReference
+    1:4:void recordMethodReference(com.android.tools.r8.graph.DexMethod):498:501 -> recordMethodReference
+    1:7:void recordReference(com.android.tools.r8.graph.DexReference):473:479 -> recordReference
+    1:8:void recordTypeReference(com.android.tools.r8.graph.DexType):487:494 -> recordTypeReference
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):431:431 -> registerAnalysis
+    1:7:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):998:1004 -> registerDeferredActionForDeadProtoBuilder
+    8:8:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1000:1000 -> registerDeferredActionForDeadProtoBuilder
+    1:32:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):757:788 -> registerFieldAccess
+    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):734:734 -> registerFieldRead
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):742:742 -> registerFieldWrite
+    1:1:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):436:436 -> registerInvokeAnalysis
+    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):725:728 -> registerMethodWithTargetAndContext
+    1:2:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):750:751 -> registerReflectiveFieldAccess
+    1:1:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):738:738 -> registerReflectiveFieldRead
+    1:1:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):746:746 -> registerReflectiveFieldWrite
+    1:5:void reportMissingClass(com.android.tools.r8.graph.DexType):1842:1842 -> reportMissingClass
+    9:12:void reportMissingClass(com.android.tools.r8.graph.DexType):1846:1849 -> reportMissingClass
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingClass
-    13:13:void reportMissingClass(com.android.tools.r8.graph.DexType):1804 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1815:1816 -> reportMissingField
+    13:13:void reportMissingClass(com.android.tools.r8.graph.DexType):1849 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1860:1861 -> 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):1816 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1809:1810 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1861 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1854:1855 -> 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):1810 -> reportMissingMethod
-    1:5:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):1621:1625 -> resolveField
-    1:7:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1633:1639 -> resolveMethod
-    8:15:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1645:1652 -> resolveMethod
-    1:3:void retainAnnotationForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):3242:3244 -> retainAnnotationForFinalTreeShaking
-    1:46:void rewriteLambdaCallSites(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):2984:3029 -> rewriteLambdaCallSites
-    1:1:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):423:423 -> setAnnotationRemoverBuilder
-    1:2:void setInitialDeadProtoTypes(java.util.Set):427:428 -> setInitialDeadProtoTypes
-    1:2:void setInitialMissingTypes(java.util.Set):432:433 -> setInitialMissingTypes
-    1:43:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3294:3336 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:25:void synthesize():2680:2704 -> synthesize
-    1:7:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2708:2714 -> synthesizeInterfaceMethodBridges
-    1:31:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2718:2748 -> synthesizeLambdas
-    32:33:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2719:2720 -> synthesizeLambdas
-    1:23:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2957:2979 -> synthesizeLibraryConversionWrappers
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):3034:3039 -> toSortedDescriptorSet
-    1:86:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3055:3140 -> trace
-    87:87:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3138:3138 -> trace
-    1:18: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):2568:2585 -> traceApplication
-    19:42: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):2572:2595 -> traceApplication
-    1:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):748:812 -> traceCallSite
-    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):809:809 -> traceCallSite
-    67:67:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):806:806 -> traceCallSite
-    68:68:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):803:803 -> traceCallSite
-    69:69:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):800:800 -> traceCallSite
-    70:70:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):797:797 -> traceCallSite
-    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):817:817 -> traceCheckCast
-    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):823:830 -> traceConstClass
-    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):834:843 -> traceConstClassOrCheckCast
-    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):842:842 -> traceConstClassOrCheckCast
-    1:12:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):851:862 -> traceInitClass
-    13:17:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):861:865 -> traceInitClass
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1855 -> reportMissingMethod
+    1:5:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1668:1672 -> resolveField
+    1:7:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1679:1685 -> resolveMethod
+    8:14:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1691:1697 -> resolveMethod
+    1:3:void retainAnnotationForFinalTreeShaking(com.android.tools.r8.graph.DexAnnotation):3333:3335 -> retainAnnotationForFinalTreeShaking
+    1:46:void rewriteLambdaCallSites(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):3075:3120 -> rewriteLambdaCallSites
+    1:1:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):441:441 -> setAnnotationRemoverBuilder
+    1:2:void setInitialDeadProtoTypes(java.util.Set):445:446 -> setInitialDeadProtoTypes
+    1:2:void setInitialMissingTypes(java.util.Set):450:451 -> setInitialMissingTypes
+    1:2:void setInitialPrunedTypes(java.util.Set):455:456 -> setInitialPrunedTypes
+    1:43:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3384:3426 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:25:void synthesize():2748:2772 -> synthesize
+    1:7:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2776:2782 -> synthesizeInterfaceMethodBridges
+    1:31:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2786:2816 -> synthesizeLambdas
+    32:33:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2787:2788 -> synthesizeLambdas
+    1:23:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3048:3070 -> synthesizeLibraryConversionWrappers
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):3125:3130 -> toSortedDescriptorSet
+    1:86:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3146:3231 -> trace
+    87:88:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3229:3230 -> trace
+    1:23: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):2598:2620 -> traceApplication
+    24:47: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):2607:2630 -> traceApplication
+    1:63:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):792:854 -> traceCallSite
+    64:64:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):851:851 -> traceCallSite
+    65:65:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):848:848 -> traceCallSite
+    66:66:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):845:845 -> traceCallSite
+    67:67:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):842:842 -> traceCallSite
+    68:68:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):839:839 -> traceCallSite
+    1:1:boolean traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):859:859 -> traceCheckCast
+    1:8:boolean traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):865:872 -> traceConstClass
+    1:10:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):876:885 -> traceConstClassOrCheckCast
+    11:11:boolean traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):884:884 -> traceConstClassOrCheckCast
+    1:12:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):893:904 -> traceInitClass
+    13:17:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):903:907 -> traceInitClass
     18:18:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> traceInitClass
-    18:18:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):869 -> traceInitClass
-    19:19:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):874:874 -> traceInitClass
+    18:18:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):911 -> traceInitClass
+    19:19:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):916:916 -> traceInitClass
     20:40:boolean com.android.tools.r8.utils.Visibility.isPrivate():0:20 -> traceInitClass
-    20:40:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):877 -> traceInitClass
-    41:41:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):877:877 -> traceInitClass
+    20:40:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):919 -> traceInitClass
+    41:41:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):919:919 -> traceInitClass
     42:42:boolean com.android.tools.r8.utils.Visibility.isPublic():0:0 -> traceInitClass
-    42:42:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):879 -> traceInitClass
-    43:43:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):880:880 -> traceInitClass
+    42:42:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):921 -> traceInitClass
+    43:43:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):922:922 -> traceInitClass
     44:44:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> traceInitClass
-    44:44:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):884 -> traceInitClass
-    45:45:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):889:889 -> traceInitClass
+    44:44:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):926 -> traceInitClass
+    45:45:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):931:931 -> traceInitClass
     46:46:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> traceInitClass
-    46:46:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):893 -> traceInitClass
-    47:47:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):893:893 -> traceInitClass
+    46:46:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):935 -> traceInitClass
+    47:47:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):935:935 -> traceInitClass
     48:48:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> traceInitClass
-    48:48:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):894 -> traceInitClass
-    49:49:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):894:894 -> traceInitClass
-    1:1:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1132:1132 -> traceInstanceFieldRead
-    2:24:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1141:1163 -> traceInstanceFieldRead
-    25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldRead
-    25:25:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1163 -> traceInstanceFieldRead
-    26:34:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1168:1176 -> traceInstanceFieldRead
-    35:35:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1175:1175 -> traceInstanceFieldRead
-    1:1:boolean traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1136:1136 -> traceInstanceFieldReadFromMethodHandle
-    1:1:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1181:1181 -> traceInstanceFieldWrite
-    2:24:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1190:1212 -> traceInstanceFieldWrite
-    25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldWrite
-    25:25:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1212 -> traceInstanceFieldWrite
-    26:34:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1217:1225 -> traceInstanceFieldWrite
-    1:1:boolean traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1185:1185 -> traceInstanceFieldWriteFromMethodHandle
-    1:11:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):940:950 -> traceInvokeDirect
-    12:16:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):974:978 -> traceInvokeDirect
+    48:48:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):936 -> traceInitClass
+    49:49:boolean traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):936:936 -> traceInitClass
+    1:1:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1174:1174 -> traceInstanceFieldRead
+    2:26:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1183:1207 -> traceInstanceFieldRead
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldRead
+    27:27:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1207 -> traceInstanceFieldRead
+    28:32:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1212:1216 -> traceInstanceFieldRead
+    33:39:boolean traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1214:1220 -> traceInstanceFieldRead
+    1:1:boolean traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1178:1178 -> traceInstanceFieldReadFromMethodHandle
+    1:1:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1225:1225 -> traceInstanceFieldWrite
+    2:26:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1234:1258 -> traceInstanceFieldWrite
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInstanceFieldWrite
+    27:27:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1258 -> traceInstanceFieldWrite
+    28:32:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1263:1267 -> traceInstanceFieldWrite
+    33:40:boolean traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1265:1272 -> traceInstanceFieldWrite
+    1:1:boolean traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1229:1229 -> traceInstanceFieldWriteFromMethodHandle
+    1:11:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):982:992 -> traceInvokeDirect
+    12:16:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1016:1020 -> traceInvokeDirect
     17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeDirect
-    17:17:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):978 -> traceInvokeDirect
-    18:19:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):980:981 -> traceInvokeDirect
-    1:1:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):969:969 -> traceInvokeDirectFromLambda
-    2:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):968:968 -> traceInvokeDirectFromLambda
-    1:1:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):986:986 -> traceInvokeInterface
-    2:6:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):996:1000 -> traceInvokeInterface
+    17:17:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1020 -> traceInvokeDirect
+    18:19:boolean traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1022:1023 -> traceInvokeDirect
+    1:1:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1011:1011 -> traceInvokeDirectFromLambda
+    2:2:boolean traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1010:1010 -> traceInvokeDirectFromLambda
+    1:1:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1028:1028 -> traceInvokeInterface
+    2:6:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1038:1042 -> traceInvokeInterface
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeInterface
-    7:7:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1000 -> traceInvokeInterface
-    8:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1002:1003 -> traceInvokeInterface
-    1:1:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):991:991 -> traceInvokeInterfaceFromLambda
-    2:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):990:990 -> traceInvokeInterfaceFromLambda
-    1:1:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1008:1008 -> traceInvokeStatic
-    2:25:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1018:1041 -> traceInvokeStatic
+    7:7:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1042 -> traceInvokeInterface
+    8:9:boolean traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1044:1045 -> traceInvokeInterface
+    1:1:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1033:1033 -> traceInvokeInterfaceFromLambda
+    2:2:boolean traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1032:1032 -> traceInvokeInterfaceFromLambda
+    1:1:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1050:1050 -> traceInvokeStatic
+    2:25:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1060:1083 -> traceInvokeStatic
     26:26:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceInvokeStatic
-    26:26:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1041 -> traceInvokeStatic
-    27:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1043:1044 -> traceInvokeStatic
-    1:1:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1013:1013 -> traceInvokeStaticFromLambda
-    2:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1012:1012 -> traceInvokeStaticFromLambda
-    1:6:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1051:1056 -> traceInvokeSuper
+    26:26:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1083 -> traceInvokeStatic
+    27:28:boolean traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1085:1086 -> traceInvokeStatic
+    1:1:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1055:1055 -> traceInvokeStaticFromLambda
+    2:2:boolean traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1054:1054 -> traceInvokeStaticFromLambda
+    1:6:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1093:1098 -> 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.ProgramMethod):1056 -> traceInvokeSuper
-    8:9:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1058:1059 -> traceInvokeSuper
-    1:1:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1064:1064 -> traceInvokeVirtual
-    2:9:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1074:1081 -> traceInvokeVirtual
-    10:21:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1076:1087 -> traceInvokeVirtual
+    7:7:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1098 -> traceInvokeSuper
+    8:9:boolean traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1100:1101 -> traceInvokeSuper
+    1:1:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1106:1106 -> traceInvokeVirtual
+    2:9:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1116:1123 -> traceInvokeVirtual
+    10:21:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1118:1129 -> traceInvokeVirtual
     22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> traceInvokeVirtual
-    22:22:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1087 -> traceInvokeVirtual
-    23:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1089:1090 -> traceInvokeVirtual
-    1:1:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1069:1069 -> traceInvokeVirtualFromLambda
-    2:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1068:1068 -> traceInvokeVirtualFromLambda
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2552:2559 -> traceMainDex
+    22:22:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1129 -> traceInvokeVirtual
+    23:24:boolean traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1131:1132 -> traceInvokeVirtual
+    1:1:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1111:1111 -> traceInvokeVirtualFromLambda
+    2:2:boolean traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1110:1110 -> traceInvokeVirtualFromLambda
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2582:2589 -> 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.ProgramMethod):917 -> traceMethodHandle
-    2:6:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):917:921 -> traceMethodHandle
-    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> traceMethodHandle
-    7:7:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):922 -> traceMethodHandle
-    8:12:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):923:927 -> traceMethodHandle
-    1:13:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1095:1107 -> traceNewInstance
-    14:14:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1103:1103 -> traceNewInstance
-    15:15:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1120:1120 -> traceNewInstance
-    16:16:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> traceNewInstance
-    16:16:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1122 -> traceNewInstance
-    17:20:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1122:1125 -> traceNewInstance
-    21:21:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1123:1123 -> traceNewInstance
-    1:3:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1111:1111 -> traceNewInstanceFromLambda
-    1:1:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1230:1230 -> traceStaticFieldRead
-    2:24:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1239:1261 -> traceStaticFieldRead
-    25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldRead
-    25:25:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1261 -> traceStaticFieldRead
-    26:33:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1264:1271 -> traceStaticFieldRead
-    34:51:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1267:1284 -> traceStaticFieldRead
-    1:1:boolean traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1234:1234 -> traceStaticFieldReadFromMethodHandle
-    1:1:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1289:1289 -> traceStaticFieldWrite
-    2:24:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1298:1320 -> traceStaticFieldWrite
-    25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldWrite
-    25:25:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1320 -> traceStaticFieldWrite
-    26:33:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1323:1330 -> traceStaticFieldWrite
-    34:51:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1326:1343 -> traceStaticFieldWrite
-    1:1:boolean traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1293:1293 -> traceStaticFieldWriteFromMethodHandle
-    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):935:935 -> traceTypeReference
-    1:1:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2138:2138 -> transitionDependentItemsForInstantiatedClass
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> transitionDependentItemsForInstantiatedClass
-    2:2:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2138 -> transitionDependentItemsForInstantiatedClass
-    3:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2138:2140 -> transitionDependentItemsForInstantiatedClass
-    1:2:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2144:2145 -> transitionDependentItemsForInstantiatedInterface
-    1:6:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2151:2156 -> transitionDependentItemsForInstantiatedItem
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> transitionDependentItemsForInstantiatedItem
-    7:7:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2156 -> transitionDependentItemsForInstantiatedItem
-    8:10:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2156:2158 -> transitionDependentItemsForInstantiatedItem
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2126:2134 -> transitionFieldsForInstantiatedClass
-    1:1:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1940:1940 -> transitionMethodsForInstantiatedClass
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> transitionMethodsForInstantiatedClass
-    2:2:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1940 -> transitionMethodsForInstantiatedClass
-    3:6:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1940:1943 -> transitionMethodsForInstantiatedClass
-    7:7:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1942:1942 -> transitionMethodsForInstantiatedClass
-    1:2:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):1934:1935 -> transitionMethodsForInstantiatedLambda
-    3:3:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):1933:1933 -> transitionMethodsForInstantiatedLambda
-    1:31:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):1955:1985 -> transitionMethodsForInstantiatedObject
-    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2162:2170 -> transitionUnusedInterfaceToLive
-    1:7:void unpinLambdaMethods():3232:3238 -> unpinLambdaMethods
-    1:3:boolean verifyKeptGraph():2762:2764 -> verifyKeptGraph
-    1:3:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1371:1373 -> verifyMethodIsTargeted
-    1:3:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):2949:2951 -> verifyReferencedMethod
-    1:15:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):2908:2922 -> verifyReferencedType
-    16:28:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):2929:2941 -> verifyReferencedType
-    1:7:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):2895:2901 -> verifyReferences
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1378:1378 -> verifyTypeIsLive
-    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):559:563 -> warnIfLibraryTypeInheritsFromProgramType
+    1:1:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):959 -> traceMethodHandle
+    2:6:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):959:963 -> traceMethodHandle
+    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> traceMethodHandle
+    7:7:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):964 -> traceMethodHandle
+    8:12:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):965:969 -> traceMethodHandle
+    1:13:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1137:1149 -> traceNewInstance
+    14:14:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1145:1145 -> traceNewInstance
+    15:15:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1162:1162 -> traceNewInstance
+    16:16:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> traceNewInstance
+    16:16:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1164 -> traceNewInstance
+    17:20:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1164:1167 -> traceNewInstance
+    21:21:boolean traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1165:1165 -> traceNewInstance
+    1:3:boolean traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1153:1153 -> traceNewInstanceFromLambda
+    1:1:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1277:1277 -> traceStaticFieldRead
+    2:25:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1286:1309 -> traceStaticFieldRead
+    26:26:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldRead
+    26:26:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1309 -> traceStaticFieldRead
+    27:33:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1312:1318 -> traceStaticFieldRead
+    34:50:boolean traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1315:1331 -> traceStaticFieldRead
+    1:1:boolean traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1281:1281 -> traceStaticFieldReadFromMethodHandle
+    1:1:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1336:1336 -> traceStaticFieldWrite
+    2:25:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1345:1368 -> traceStaticFieldWrite
+    26:26:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> traceStaticFieldWrite
+    26:26:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1368 -> traceStaticFieldWrite
+    27:33:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1371:1377 -> traceStaticFieldWrite
+    34:50:boolean traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1374:1390 -> traceStaticFieldWrite
+    1:1:boolean traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1340:1340 -> traceStaticFieldWriteFromMethodHandle
+    1:1:boolean traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):977:977 -> traceTypeReference
+    1:1:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2182:2182 -> transitionDependentItemsForInstantiatedClass
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> transitionDependentItemsForInstantiatedClass
+    2:2:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2182 -> transitionDependentItemsForInstantiatedClass
+    3:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2182:2184 -> transitionDependentItemsForInstantiatedClass
+    1:2:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2188:2189 -> transitionDependentItemsForInstantiatedInterface
+    1:6:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2195:2200 -> transitionDependentItemsForInstantiatedItem
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> transitionDependentItemsForInstantiatedItem
+    7:7:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2200 -> transitionDependentItemsForInstantiatedItem
+    8:10:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2200:2202 -> transitionDependentItemsForInstantiatedItem
+    1:8:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2171:2178 -> transitionFieldsForInstantiatedClass
+    1:1:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1985:1985 -> transitionMethodsForInstantiatedClass
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> transitionMethodsForInstantiatedClass
+    2:2:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1985 -> transitionMethodsForInstantiatedClass
+    3:6:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1985:1988 -> transitionMethodsForInstantiatedClass
+    7:7:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1987:1987 -> transitionMethodsForInstantiatedClass
+    1:2:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):1979:1980 -> transitionMethodsForInstantiatedLambda
+    3:3:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):1978:1978 -> transitionMethodsForInstantiatedLambda
+    1:31:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2000:2030 -> transitionMethodsForInstantiatedObject
+    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2206:2214 -> transitionUnusedInterfaceToLive
+    1:7:void unpinLambdaMethods():3323:3329 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2830:2832 -> verifyKeptGraph
+    1:3:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1418:1420 -> verifyMethodIsTargeted
+    1:5:boolean verifyMissingTypes():2970:2974 -> verifyMissingTypes
+    1:3:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3040:3042 -> verifyReferencedMethod
+    1:15:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):2999:3013 -> verifyReferencedType
+    16:28:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3020:3032 -> verifyReferencedType
+    1:7:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):2986:2992 -> verifyReferences
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1425:1425 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):609:613 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():795:795 -> <clinit>
+    1:1:void <clinit>():837:837 -> <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):3874:3874 -> <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):3881:3884 -> <init>
-    1:3:boolean addField(com.android.tools.r8.graph.DexField):3894:3896 -> addField
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> addField
-    4:4:boolean addField(com.android.tools.r8.graph.DexField):3896 -> addField
-    5:15:boolean addField(com.android.tools.r8.graph.DexField):3900:3910 -> addField
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> addField
-    16:16:boolean addField(com.android.tools.r8.graph.DexField):3910 -> addField
-    17:29:boolean addField(com.android.tools.r8.graph.DexField):3910:3922 -> addField
-    1:12:boolean addMethod(com.android.tools.r8.graph.DexMethod):3931:3942 -> addMethod
-    13:23:boolean addMethod(com.android.tools.r8.graph.DexMethod):3940:3950 -> addMethod
-    24:24:boolean addMethod(com.android.tools.r8.graph.DexMethod):3948:3948 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3980:3981 -> 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):3990:3990 -> <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):3997:4000 -> <init>
+    1:2:boolean addField(com.android.tools.r8.graph.DexField):4010:4011 -> addField
+    3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):179:179 -> addField
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):4015 -> addField
+    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):188:188 -> addField
+    4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):179 -> addField
+    4:4:boolean addField(com.android.tools.r8.graph.DexField):4015 -> addField
+    5:8:boolean addField(com.android.tools.r8.graph.DexField):4020:4023 -> addField
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> addField
+    9:9:boolean addField(com.android.tools.r8.graph.DexField):4023 -> addField
+    10:18:boolean addField(com.android.tools.r8.graph.DexField):4025:4033 -> addField
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():396:396 -> addField
+    19:19:boolean addField(com.android.tools.r8.graph.DexField):4033 -> addField
+    20:24:boolean addField(com.android.tools.r8.graph.DexField):4033:4037 -> addField
+    25:31:boolean addField(com.android.tools.r8.graph.DexField):4036:4042 -> addField
+    1:12:boolean addMethod(com.android.tools.r8.graph.DexMethod):4050:4061 -> addMethod
+    13:23:boolean addMethod(com.android.tools.r8.graph.DexMethod):4059:4069 -> addMethod
+    24:24:boolean addMethod(com.android.tools.r8.graph.DexMethod):4067:4067 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):4099:4100 -> addType
     1:1:com.android.tools.r8.graph.InitClassLens com.android.tools.r8.dex.IndexedItemCollection.getInitClassLens():104:104 -> getInitClassLens
     1:1:com.android.tools.r8.graph.InitClassLens getInitClassLens():0 -> getInitClassLens
     1:1:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedDescriptor(com.android.tools.r8.graph.DexType):116:116 -> getRenamedDescriptor
@@ -61745,101 +62735,117 @@
     1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):0 -> getRenamedName
     2:2:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.IndexedItemCollection.getRenamedName(com.android.tools.r8.graph.DexField):112:112 -> getRenamedName
     2:2:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):0 -> getRenamedName
+com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$1):4106:4106 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):4111:4113 -> <init>
+    1:1:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):4118:4118 -> definitionFor
+    2:2:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):4123:4123 -> definitionFor
+    3:3:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):4128:4128 -> definitionFor
+    4:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):4133:4133 -> definitionFor
+    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):4138:4138 -> definitionForProgramType
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():4143:4143 -> dexItemFactory
+com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3916:3916 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3912:3917 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):3910:3910 -> access$1300
+    1:4:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3921:3924 -> add
+    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedField):3928:3928 -> contains
+    2:2:boolean contains(com.android.tools.r8.graph.ProgramField):3932:3932 -> contains
 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):3826:3826 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3822:3827 -> <init>
-    1:1:java.util.Set access$1100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3820:3820 -> access$1100
-    1:4:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3831:3834 -> add
-    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3838:3838 -> contains
-    2:2:boolean contains(com.android.tools.r8.graph.ProgramMethod):3842:3842 -> contains
-    1:1:java.util.Set getItems():3846:3846 -> getItems
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3942:3942 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):3938:3943 -> <init>
+    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):3936:3936 -> access$1200
+    1:4:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3947:3950 -> add
+    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):3954:3954 -> contains
+    2:2:boolean contains(com.android.tools.r8.graph.ProgramMethod):3958:3958 -> contains
+    1:1:java.util.Set getItems():3962:3962 -> getItems
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
-    1:4:void <clinit>():150:153 -> <clinit>
-    5:5:void <clinit>():149:149 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
-    1:1:boolean isFinalTreeShaking():160:160 -> isFinalTreeShaking
-    1:1:boolean isInitialOrFinalTreeShaking():164:164 -> isInitialOrFinalTreeShaking
-    1:1:boolean isInitialTreeShaking():156:156 -> isInitialTreeShaking
-    1:1:boolean isTracingMainDex():168:168 -> isTracingMainDex
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):149:149 -> valueOf
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():149:149 -> values
+    1:4:void <clinit>():156:159 -> <clinit>
+    5:5:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>(java.lang.String,int):155:155 -> <init>
+    1:1:boolean isFinalTreeShaking():166:166 -> isFinalTreeShaking
+    1:1:boolean isInitialOrFinalTreeShaking():170:170 -> isInitialOrFinalTreeShaking
+    1:1:boolean isInitialTreeShaking():162:162 -> isInitialTreeShaking
+    1:1:boolean isTracingMainDex():174:174 -> isTracingMainDex
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):155:155 -> valueOf
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():155:155 -> values
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):3856:3856 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):3852:3857 -> <init>
-    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$SetWithReason):3850:3850 -> access$1200
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3861:3862 -> add
-    1:1:boolean contains(java.lang.Object):3866:3866 -> contains
-    1:1:java.util.Set getItems():3870:3870 -> getItems
+    1:1:void <init>(java.util.function.BiConsumer):3972:3972 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):3968:3973 -> <init>
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):3977:3978 -> add
+    1:1:boolean contains(java.lang.Object):3982:3982 -> contains
+    1:1:java.util.Set getItems():3986:3986 -> getItems
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
-    1:1:void <clinit>():3789:3789 -> <clinit>
-    1:4:void <init>():3789:3792 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3789:3789 -> <init>
-    1:1:java.util.Set access$1000(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3789:3789 -> access$1000
-    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3795:3797 -> add
-    1:1:boolean contains(java.lang.Object):3804:3804 -> contains
-    1:1:java.util.Set getItems():3816:3816 -> getItems
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3809:3809 -> lambda$registerDeferredAction$0
-    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3808:3809 -> registerDeferredAction
+    1:1:void <clinit>():3879:3879 -> <clinit>
+    1:4:void <init>():3879:3882 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3879:3879 -> <init>
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):3879:3879 -> access$300
+    1:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3885:3887 -> add
+    1:1:boolean contains(java.lang.Object):3894:3894 -> contains
+    1:1:java.util.Set getItems():3906:3906 -> getItems
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):3899:3899 -> lambda$registerDeferredAction$0
+    1:2:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):3898:3899 -> registerDeferredAction
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions:
-    1:1:void <clinit>():2600:2600 -> <clinit>
-    1:14:void <init>():2600:2613 -> <init>
-    15:15:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2600:2600 -> <init>
-    1:2:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):2631:2632 -> addClasspathClass
-    1:4:void addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):2623:2626 -> addInstantiatedClass
-    1:2:void addLiveAndPinnedMethod(com.android.tools.r8.graph.ProgramMethod):2642:2643 -> addLiveAndPinnedMethod
-    1:3:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):2636:2638 -> addLiveMethod
-    1:7:void amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):2647:2653 -> amendApplication
-    1:11:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2657:2667 -> enqueueWorkItems
-    12:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2665:2674 -> enqueueWorkItems
-    1:2:boolean isEmpty():2616:2617 -> isEmpty
+    1:1:void <clinit>():2668:2668 -> <clinit>
+    1:14:void <init>():2668:2681 -> <init>
+    15:15:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2668:2668 -> <init>
+    1:2:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):2699:2700 -> addClasspathClass
+    1:4:void addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):2691:2694 -> addInstantiatedClass
+    1:2:void addLiveAndPinnedMethod(com.android.tools.r8.graph.ProgramMethod):2710:2711 -> addLiveAndPinnedMethod
+    1:3:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):2704:2706 -> addLiveMethod
+    1:7:void amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):2715:2721 -> amendApplication
+    1:11:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2725:2735 -> enqueueWorkItems
+    12:21:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2733:2742 -> enqueueWorkItems
+    1:2:boolean isEmpty():2684:2685 -> isEmpty
+    1:1:void lambda$enqueueWorkItems$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):2730:2730 -> lambda$enqueueWorkItems$0
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():15:15 -> <init>
-    1:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set):27:31 -> createForFinalTreeShaking
+    1:6:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set,java.util.Set):28:33 -> createForFinalTreeShaking
     1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):19:19 -> createForInitialTreeShaking
-    1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):37:37 -> createForMainDexTracing
-    2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):44:44 -> createForMainDexTracing
-    1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):51:51 -> createForWhyAreYouKeeping
-    1:1:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):30:30 -> lambda$createForFinalTreeShaking$0
+    1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):39:39 -> createForMainDexTracing
+    2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):46:46 -> createForMainDexTracing
+    1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):53:53 -> createForWhyAreYouKeeping
+    1:1:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):31:31 -> lambda$createForFinalTreeShaking$0
 com.android.tools.r8.shaking.EnqueuerUtils -> com.android.tools.r8.shaking.EnqueuerUtils:
     1:1:void <init>():11:11 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> toImmutableSortedMap
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.EnqueuerWorklist:
     1:1:void <clinit>():18:18 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):234:234 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):232:235 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):239:239 -> createWorklist
-    1:1:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):277:277 -> enqueueMarkAnnotationInstantiatedAction
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> enqueueMarkAnnotationInstantiatedAction
-    2:2:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):277 -> enqueueMarkAnnotationInstantiatedAction
-    3:5:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):277:279 -> enqueueMarkAnnotationInstantiatedAction
-    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):298:299 -> enqueueMarkFieldKeptAction
-    1:1:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):271:271 -> enqueueMarkInstantiatedAction
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> enqueueMarkInstantiatedAction
-    2:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):271 -> enqueueMarkInstantiatedAction
-    3:5:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):271:273 -> enqueueMarkInstantiatedAction
-    1:1:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):283:283 -> enqueueMarkInterfaceInstantiatedAction
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():460:460 -> enqueueMarkInterfaceInstantiatedAction
-    2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):283 -> enqueueMarkInterfaceInstantiatedAction
-    3:5:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):283:285 -> enqueueMarkInterfaceInstantiatedAction
-    1:1:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):293:293 -> enqueueMarkMethodKeptAction
-    1:1:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):289:289 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):251:251 -> enqueueMarkReachableDirectAction
-    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):260:261 -> enqueueMarkReachableFieldAction
-    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):255:255 -> enqueueMarkReachableSuperAction
-    1:1:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):303:303 -> enqueueTraceConstClassAction
-    1:1:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):307:307 -> enqueueTraceInvokeDirectAction
-    1:1:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):311:311 -> enqueueTraceNewInstanceAction
-    1:1:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):315:315 -> enqueueTraceStaticFieldRead
-    1:1:boolean isEmpty():243:243 -> isEmpty
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():247:247 -> poll
+    1:1:void <init>(com.android.tools.r8.graph.AppView):231:231 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):229:232 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):236:236 -> createWorklist
+    1:1:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:272 -> enqueueMarkAnnotationInstantiatedAction
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> enqueueMarkAnnotationInstantiatedAction
+    2:2:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272 -> enqueueMarkAnnotationInstantiatedAction
+    3:5:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:274 -> enqueueMarkAnnotationInstantiatedAction
+    1:1:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):292:292 -> enqueueMarkFieldKeptAction
+    1:1:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:266 -> enqueueMarkInstantiatedAction
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> enqueueMarkInstantiatedAction
+    2:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266 -> enqueueMarkInstantiatedAction
+    3:5:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:268 -> enqueueMarkInstantiatedAction
+    1:1:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:278 -> enqueueMarkInterfaceInstantiatedAction
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():465:465 -> enqueueMarkInterfaceInstantiatedAction
+    2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278 -> enqueueMarkInterfaceInstantiatedAction
+    3:5:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:280 -> enqueueMarkInterfaceInstantiatedAction
+    1:1:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):288:288 -> enqueueMarkMethodKeptAction
+    1:1:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):284:284 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):248:248 -> enqueueMarkReachableDirectAction
+    1:1:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):256:256 -> enqueueMarkReachableFieldAction
+    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> enqueueMarkReachableSuperAction
+    1:1:void enqueueTraceConstClassAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):296:296 -> enqueueTraceConstClassAction
+    1:1:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):300:300 -> enqueueTraceInvokeDirectAction
+    1:1:void enqueueTraceNewInstanceAction(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):304:304 -> enqueueTraceNewInstanceAction
+    1:1:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):308:308 -> enqueueTraceStaticFieldRead
+    1:1:boolean isEmpty():240:240 -> isEmpty
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():244:244 -> poll
 com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction:
     1:1:void <init>():20:20 -> <init>
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction:
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):97:99 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):104:104 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):159:162 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):167:167 -> run
+    1:3:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):157:159 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):164:164 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction:
     1:5:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):80:84 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):89:89 -> run
@@ -61856,23 +62862,23 @@
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):28:30 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):35:35 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):58:60 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):58:60 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):65:65 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction:
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):43:45 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):50:50 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):175:177 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):182:182 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):172:174 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):179:179 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):190:192 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):197:197 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187:189 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):194:194 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):205:207 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):212:212 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):202:204 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):209:209 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):220:222 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):227:227 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):217:219 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):224:224 -> run
 com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.shaking.FilteredClassPath:
     1:5:void <init>(java.nio.file.Path,java.util.List,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):27:31 -> <init>
     6:6:void <init>(java.nio.file.Path):35:35 -> <init>
@@ -61886,76 +62892,76 @@
     1:16:java.lang.String toString():128:143 -> toString
     1:1:com.android.tools.r8.shaking.FilteredClassPath unfiltered(java.nio.file.Path):39:39 -> unfiltered
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.GraphReporter:
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):59:59 -> <init>
-    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):52:66 -> <init>
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):416:416 -> definitionFor
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness fakeReportShouldNotBeUsed():71:71 -> fakeReportShouldNotBeUsed
-    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):420:420 -> getAnnotationGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):432:432 -> getClassGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):407:407 -> getEdgeInfo
-    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):411:411 -> getEdgeInfo
-    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):464:464 -> getFieldGraphNode
-    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):394:403 -> getGraphNode
-    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):486:506 -> getKeepRuleGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):443:443 -> getMethodGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):390:390 -> getSourceNode
-    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):385:385 -> isNonProgramClass
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> isNonProgramClass
-    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):385 -> isNonProgramClass
-    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> isNonProgramClass
-    1:5:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):423:427 -> lambda$getAnnotationGraphNode$1
-    1:4:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):435:438 -> lambda$getClassGraphNode$2
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):411:411 -> lambda$getEdgeInfo$0
-    1:7:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):467:473 -> lambda$getFieldGraphNode$4
-    8:8:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):470:470 -> lambda$getFieldGraphNode$4
-    1:1:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):491:491 -> lambda$getKeepRuleGraphNode$5
-    1:5:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):499:503 -> lambda$getKeepRuleGraphNode$6
-    1:14:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):446:459 -> lambda$getMethodGraphNode$3
-    15:15:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):453:453 -> lambda$getMethodGraphNode$3
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):348:351 -> registerAnnotation
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):341:344 -> registerClass
-    1:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):374:381 -> registerEdge
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):367:370 -> registerField
-    1:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):333:337 -> registerInterface
-    1:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):355:363 -> registerMethod
-    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):205:210 -> reportClassReferencedFrom
-    7:12:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):214:219 -> reportClassReferencedFrom
-    13:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):223:228 -> reportClassReferencedFrom
-    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):272:278 -> reportCompanionClass
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):277:277 -> reportCompanionClass
-    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):283:289 -> reportCompanionMethod
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):287:287 -> reportCompanionMethod
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):194:197 -> reportCompatInstantiated
-    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):195:200 -> reportCompatInstantiated
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):173:173 -> reportCompatKeepDefaultInitializer
-    2:565:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:563 -> reportCompatKeepDefaultInitializer
-    2:565:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):173 -> reportCompatKeepDefaultInitializer
-    566:566:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:174 -> reportCompatKeepDefaultInitializer
-    567:572:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):173:178 -> reportCompatKeepDefaultInitializer
-    573:578:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):176:181 -> reportCompatKeepDefaultInitializer
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> reportCompatKeepMethod
-    1:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):294:296 -> reportEdge
-    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):111:116 -> reportKeepClass
-    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):121:127 -> reportKeepClass
-    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):153:158 -> reportKeepField
-    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):163:169 -> reportKeepField
-    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):132:137 -> reportKeepMethod
-    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):142:148 -> reportKeepMethod
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):262:265 -> reportLibraryMethodAsLive
-    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:268 -> reportLibraryMethodAsLive
-    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):100:106 -> reportPrecondition
-    1:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):234:243 -> reportReachableClassInitializer
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):248:251 -> reportReachableMethodAsLive
-    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:254 -> reportReachableMethodAsLive
-    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):324:329 -> skipReporting
-    1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):75:95 -> verifyRootedPath
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):60:60 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):53:67 -> <init>
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):417:417 -> definitionFor
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness fakeReportShouldNotBeUsed():72:72 -> fakeReportShouldNotBeUsed
+    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):421:421 -> getAnnotationGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):433:433 -> getClassGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):408:408 -> getEdgeInfo
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> getEdgeInfo
+    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):465:465 -> getFieldGraphNode
+    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):395:404 -> getGraphNode
+    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):487:507 -> getKeepRuleGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):444:444 -> getMethodGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> getSourceNode
+    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> isNonProgramClass
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> isNonProgramClass
+    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386 -> isNonProgramClass
+    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):387:387 -> isNonProgramClass
+    1:5:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):424:428 -> lambda$getAnnotationGraphNode$1
+    1:4:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):436:439 -> lambda$getClassGraphNode$2
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> lambda$getEdgeInfo$0
+    1:7:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):468:474 -> lambda$getFieldGraphNode$4
+    8:8:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):471:471 -> lambda$getFieldGraphNode$4
+    1:1:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):492:492 -> lambda$getKeepRuleGraphNode$5
+    1:5:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):500:504 -> lambda$getKeepRuleGraphNode$6
+    1:14:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):447:460 -> lambda$getMethodGraphNode$3
+    15:15:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):454:454 -> lambda$getMethodGraphNode$3
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):349:352 -> registerAnnotation
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):342:345 -> registerClass
+    1:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):375:382 -> registerEdge
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):368:371 -> registerField
+    1:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):334:338 -> registerInterface
+    1:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):356:364 -> registerMethod
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):206:211 -> reportClassReferencedFrom
+    7:12:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):215:220 -> reportClassReferencedFrom
+    13:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):224:229 -> reportClassReferencedFrom
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):273:279 -> reportCompanionClass
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):278:278 -> reportCompanionClass
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):284:290 -> reportCompanionMethod
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> reportCompanionMethod
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):195:198 -> reportCompatInstantiated
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):196:201 -> reportCompatInstantiated
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:174 -> reportCompatKeepDefaultInitializer
+    2:570:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:568 -> reportCompatKeepDefaultInitializer
+    2:570:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174 -> reportCompatKeepDefaultInitializer
+    571:571:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> reportCompatKeepDefaultInitializer
+    572:577:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:179 -> reportCompatKeepDefaultInitializer
+    578:583:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):177:182 -> reportCompatKeepDefaultInitializer
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):190:190 -> reportCompatKeepMethod
+    1:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):295:297 -> reportEdge
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):112:117 -> reportKeepClass
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):122:128 -> reportKeepClass
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):154:159 -> reportKeepField
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):164:170 -> reportKeepField
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):133:138 -> reportKeepMethod
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):143:149 -> reportKeepMethod
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:266 -> reportLibraryMethodAsLive
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):264:269 -> reportLibraryMethodAsLive
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):101:107 -> reportPrecondition
+    1:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):235:244 -> reportReachableClassInitializer
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:252 -> reportReachableMethodAsLive
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):250:255 -> reportReachableMethodAsLive
+    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):325:330 -> skipReporting
+    1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):76:96 -> verifyRootedPath
 com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness:
-    1:1:void <clinit>():306:306 -> <clinit>
-    1:1:void <init>():308:308 -> <init>
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():304:304 -> access$000
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():314:314 -> edgeKind
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):319:319 -> getSourceNode
+    1:1:void <clinit>():307:307 -> <clinit>
+    1:1:void <init>():309:309 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():305:305 -> access$000
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():315:315 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):320:320 -> getSourceNode
 com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.IfRuleClassPartEquivalence:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> doEquivalent
@@ -61972,12 +62978,12 @@
     6:7:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:155 -> canRemoveSubsequentKeepRule
     1:17:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):197:213 -> evaluateClassForIfRule
     1:2:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):220:221 -> evaluateIfRuleMembersAndMaterialize
-    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():483:483 -> evaluateIfRuleMembersAndMaterialize
+    3:3:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():488:488 -> evaluateIfRuleMembersAndMaterialize
     3:3:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222 -> evaluateIfRuleMembersAndMaterialize
     4:11:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:229 -> evaluateIfRuleMembersAndMaterialize
     12:21:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:236 -> evaluateIfRuleMembersAndMaterialize
     22:51:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):234:263 -> evaluateIfRuleMembersAndMaterialize
-    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():483:483 -> evaluateIfRuleMembersAndMaterialize
+    52:52:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.toReference():488:488 -> evaluateIfRuleMembersAndMaterialize
     52:52:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):269 -> evaluateIfRuleMembersAndMaterialize
     53:54:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):269:270 -> evaluateIfRuleMembersAndMaterialize
     1:10:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):179:188 -> isEffectivelyLive
@@ -61990,10 +62996,10 @@
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):167:171 -> registerClassCapture
     1:17:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():63:79 -> run
     18:53:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():78:113 -> run
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> run
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> run
     54:54:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114 -> run
     55:89:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114:148 -> run
-    90:90:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():146:146 -> run
+    90:91:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():146:147 -> run
 com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.InlineRule:
     1:3:void <clinit>():11:13 -> <clinit>
     1:4: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.InlineRule$Type):67:70 -> <init>
@@ -62120,7 +63126,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):38:44 -> <init>
     9:9:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
     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):216:216 -> analyze
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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
@@ -62144,9 +63150,9 @@
     1:1:void <clinit>():182:182 -> <clinit>
     1:1:void <init>():185:185 -> <init>
     1:1:com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration getInstance():188:188 -> getInstance
-    1:23:boolean isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):209:231 -> isLegitimateConstructorInvocation
-    1:3: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):197:199 -> isLegitimateEscapeRoute
-    4:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):198:198 -> isLegitimateEscapeRoute
+    1:23:boolean isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):209:231 -> isLegitimateConstructorInvocation
+    1:3:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):197:199 -> isLegitimateEscapeRoute
+    4:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):198:198 -> isLegitimateEscapeRoute
 com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.shaking.MainDexClasses:
     1:3:void <clinit>():18:20 -> <clinit>
     1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):18:18 -> <init>
@@ -62179,7 +63185,7 @@
     1:16:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):68:83 -> hasReferencesOutsideFromCode
     1:5:void lambda$hasReferencesOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexType):73:77 -> lambda$hasReferencesOutsideFromCode$3
     1:1:void lambda$run$0(com.android.tools.r8.graph.DexEncodedField):51:51 -> lambda$run$0
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():257:257 -> lambda$run$1
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> lambda$run$1
     1:1:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):54 -> lambda$run$1
     2:3:boolean lambda$run$1(com.android.tools.r8.graph.DexEncodedMethod):54:55 -> lambda$run$1
     1:1:void lambda$run$2(com.android.tools.r8.graph.ProgramMethod):57:57 -> lambda$run$2
@@ -62369,7 +63375,8 @@
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder builder():24:24 -> builder
     1:1:com.android.tools.r8.shaking.ProguardClassNameList emptyList():28:28 -> emptyList
     1:1:java.lang.Iterable getWildcards():87:87 -> getWildcards
-    1:1:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):91:91 -> getWildcardsOrEmpty
+    1:1:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):95:95 -> getWildcardsOrEmpty
+    1:1:boolean hasWildcards():91:91 -> hasWildcards
     1:1:com.android.tools.r8.shaking.ProguardClassNameList singletonList(com.android.tools.r8.shaking.ProguardTypeMatcher):32:32 -> singletonList
     1:3:java.lang.String toString():71:73 -> toString
 com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.ProguardClassNameList$Builder:
@@ -62379,52 +63386,52 @@
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> addClassName
     1:8:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> build
 com.android.tools.r8.shaking.ProguardClassNameList$EmptyClassNameList -> com.android.tools.r8.shaking.ProguardClassNameList$EmptyClassNameList:
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):100:100 -> <init>
-    2:2:void <init>():102:102 -> <init>
-    1:1:boolean equals(java.lang.Object):116:116 -> equals
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):104:104 -> <init>
+    2:2:void <init>():106:106 -> <init>
+    1:1:boolean equals(java.lang.Object):120:120 -> equals
 com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList:
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):279:279 -> <init>
-    2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:284 -> <init>
-    1:5:boolean equals(java.lang.Object):312:316 -> equals
-    1:1:void forEachTypeMatcher(java.util.function.Consumer):358:358 -> forEachTypeMatcher
-    1:3:java.lang.Iterable getWildcards():342:344 -> getWildcards
-    1:1:int hashCode():321:321 -> hashCode
-    1:1:void lambda$forEachTypeMatcher$2(java.util.function.Consumer,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry):358:358 -> lambda$forEachTypeMatcher$2
-    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):344:344 -> lambda$getWildcards$0
-    1:1:void lambda$materialize$1(com.android.tools.r8.shaking.ProguardClassNameList$Builder,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher,java.lang.Boolean):352:352 -> lambda$materialize$1
-    1:4:boolean matches(com.android.tools.r8.graph.DexType):331:334 -> matches
-    1:4:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):350:353 -> materialize
-    1:1:int size():289:289 -> size
-    1:8:void writeTo(java.lang.StringBuilder):295:302 -> writeTo
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):283:283 -> <init>
+    2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):287:288 -> <init>
+    1:5:boolean equals(java.lang.Object):316:320 -> equals
+    1:1:void forEachTypeMatcher(java.util.function.Consumer):362:362 -> forEachTypeMatcher
+    1:3:java.lang.Iterable getWildcards():346:348 -> getWildcards
+    1:1:int hashCode():325:325 -> hashCode
+    1:1:void lambda$forEachTypeMatcher$2(java.util.function.Consumer,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry):362:362 -> lambda$forEachTypeMatcher$2
+    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):348:348 -> lambda$getWildcards$0
+    1:1:void lambda$materialize$1(com.android.tools.r8.shaking.ProguardClassNameList$Builder,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher,java.lang.Boolean):356:356 -> lambda$materialize$1
+    1:4:boolean matches(com.android.tools.r8.graph.DexType):335:338 -> matches
+    1:4:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):354:357 -> materialize
+    1:1:int size():293:293 -> size
+    1:8:void writeTo(java.lang.StringBuilder):299:306 -> writeTo
 com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList:
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):201:201 -> <init>
-    2:3:void <init>(java.util.Collection):205:206 -> <init>
-    1:3:java.util.List asSpecificDexTypes():245:247 -> asSpecificDexTypes
-    1:5:boolean equals(java.lang.Object):231:235 -> equals
-    1:1:void forEachTypeMatcher(java.util.function.Consumer):275:275 -> forEachTypeMatcher
-    1:3:java.lang.Iterable getWildcards():259:261 -> getWildcards
-    1:1:int hashCode():240:240 -> hashCode
-    1:1:boolean lambda$asSpecificDexTypes$0(com.android.tools.r8.shaking.ProguardTypeMatcher):245:245 -> lambda$asSpecificDexTypes$0
-    1:1:java.util.stream.Stream lambda$getWildcards$2(java.lang.Iterable):261:261 -> lambda$getWildcards$2
-    1:1:boolean lambda$matches$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher):254:254 -> lambda$matches$1
-    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$3(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):269:269 -> lambda$materialize$3
-    1:1:boolean matches(com.android.tools.r8.graph.DexType):254:254 -> matches
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):201:201 -> materialize
-    2:5:com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):267:270 -> materialize
-    1:1:int size():211:211 -> size
-    1:5:void writeTo(java.lang.StringBuilder):217:221 -> writeTo
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):205:205 -> <init>
+    2:3:void <init>(java.util.Collection):209:210 -> <init>
+    1:3:java.util.List asSpecificDexTypes():249:251 -> asSpecificDexTypes
+    1:5:boolean equals(java.lang.Object):235:239 -> equals
+    1:1:void forEachTypeMatcher(java.util.function.Consumer):279:279 -> forEachTypeMatcher
+    1:3:java.lang.Iterable getWildcards():263:265 -> getWildcards
+    1:1:int hashCode():244:244 -> hashCode
+    1:1:boolean lambda$asSpecificDexTypes$0(com.android.tools.r8.shaking.ProguardTypeMatcher):249:249 -> lambda$asSpecificDexTypes$0
+    1:1:java.util.stream.Stream lambda$getWildcards$2(java.lang.Iterable):265:265 -> lambda$getWildcards$2
+    1:1:boolean lambda$matches$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher):258:258 -> lambda$matches$1
+    1:1:com.android.tools.r8.shaking.ProguardTypeMatcher lambda$materialize$3(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardTypeMatcher):273:273 -> lambda$materialize$3
+    1:1:boolean matches(com.android.tools.r8.graph.DexType):258:258 -> matches
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):205:205 -> materialize
+    2:5:com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):271:274 -> materialize
+    1:1:int size():215:215 -> size
+    1:5:void writeTo(java.lang.StringBuilder):221:225 -> writeTo
 com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList:
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):139:139 -> <init>
-    2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):143:144 -> <init>
-    1:2:java.util.List asSpecificDexTypes():176:177 -> asSpecificDexTypes
-    1:5:boolean equals(java.lang.Object):162:166 -> equals
-    1:1:void forEachTypeMatcher(java.util.function.Consumer):197:197 -> forEachTypeMatcher
-    1:1:java.lang.Iterable getWildcards():187:187 -> getWildcards
-    1:1:int hashCode():171:171 -> hashCode
-    1:1:boolean matches(com.android.tools.r8.graph.DexType):182:182 -> matches
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):139:139 -> materialize
-    2:2:com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):192:192 -> materialize
-    1:1:void writeTo(java.lang.StringBuilder):154:154 -> writeTo
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):143:143 -> <init>
+    2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):147:148 -> <init>
+    1:2:java.util.List asSpecificDexTypes():180:181 -> asSpecificDexTypes
+    1:5:boolean equals(java.lang.Object):166:170 -> equals
+    1:1:void forEachTypeMatcher(java.util.function.Consumer):201:201 -> forEachTypeMatcher
+    1:1:java.lang.Iterable getWildcards():191:191 -> getWildcards
+    1:1:int hashCode():175:175 -> hashCode
+    1:1:boolean matches(com.android.tools.r8.graph.DexType):186:186 -> matches
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):143:143 -> materialize
+    2:2:com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList materialize(com.android.tools.r8.graph.DexItemFactory):196:196 -> materialize
+    1:1:void writeTo(java.lang.StringBuilder):158:158 -> writeTo
 com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.ProguardClassSpecification:
     1:1:void <clinit>():16:16 -> <clinit>
     1:18: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):199:216 -> <init>
@@ -62617,267 +63624,250 @@
     11:11:void synthesizeKeepRulesForRecompilation():318:318 -> synthesizeKeepRulesForRecompilation
     12:12:void synthesizeKeepRulesForRecompilation():317:317 -> synthesizeKeepRulesForRecompilation
 com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.ProguardConfigurationParser:
-    1:50:void <clinit>():55:104 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):108:108 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):112:117 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> access$000
-    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> access$100
-    1:1:java.util.List access$1000():46:46 -> access$1000
-    1:1:java.util.List access$1100():46:46 -> access$1100
-    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> access$1200
-    1:1:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46:46 -> access$1300
-    1:1:boolean access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> access$200
-    1:1:java.util.List access$300():46:46 -> access$300
-    1:1:java.util.List access$400():46:46 -> access$400
-    1:1:java.util.List access$500():46:46 -> access$500
-    1:1:java.util.List access$600():46:46 -> access$600
-    1:1:java.util.List access$700():46:46 -> access$700
-    1:1:java.util.List access$800():46:46 -> access$800
-    1:1:java.util.List access$900():46:46 -> access$900
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():153:154 -> getConfig
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():162:163 -> getConfigRawForTesting
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():121:121 -> getConfigurationBuilder
-    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2096:2102 -> getTextSourceSnippet
-    1:1:void parse(java.nio.file.Path):167:167 -> parse
-    2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):171:171 -> parse
-    3:10:void parse(java.util.List):175:182 -> parse
-    11:13:void parse(java.util.List):179:179 -> parse
-    19:19:void parse(java.util.List):185:185 -> parse
-    1:7:void validate():125:131 -> validate
-    8:10:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> validate
-    8:10:void validate():128 -> validate
-    11:22:void validate():133:144 -> validate
+    1:50:void <clinit>():54:103 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):107:107 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean):111:116 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> access$000
+    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> access$100
+    1:1:java.util.List access$1000():45:45 -> access$1000
+    1:1:java.util.List access$1100():45:45 -> access$1100
+    1:1:com.android.tools.r8.graph.DexItemFactory access$1200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> access$1200
+    1:1:java.lang.String access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):45:45 -> access$1300
+    1:1:boolean access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):45:45 -> access$200
+    1:1:java.util.List access$300():45:45 -> access$300
+    1:1:java.util.List access$400():45:45 -> access$400
+    1:1:java.util.List access$500():45:45 -> access$500
+    1:1:java.util.List access$600():45:45 -> access$600
+    1:1:java.util.List access$700():45:45 -> access$700
+    1:1:java.util.List access$800():45:45 -> access$800
+    1:1:java.util.List access$900():45:45 -> access$900
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():152:153 -> getConfig
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():161:162 -> getConfigRawForTesting
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():120:120 -> getConfigurationBuilder
+    1:7:java.lang.String getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):2102:2108 -> getTextSourceSnippet
+    1:1:void parse(java.nio.file.Path):166:166 -> parse
+    2:2:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):170:170 -> parse
+    3:10:void parse(java.util.List):174:181 -> parse
+    11:13:void parse(java.util.List):178:178 -> parse
+    19:19:void parse(java.util.List):184:184 -> parse
+    1:7:void validate():124:130 -> validate
+    8:24:void validate():127:143 -> 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):2110:2112 -> <init>
-    1:2:boolean hasBackreference():2124:2125 -> hasBackreference
-    1:15:boolean hasUnusualCharacters():2129:2143 -> hasUnusualCharacters
-    1:1:boolean isMatchAllNames():2120:2120 -> isMatchAllNames
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2116:2116 -> withoutWildcards
+    1:3:void <init>(java.lang.String,java.util.List):2116:2118 -> <init>
+    1:2:boolean hasBackreference():2130:2131 -> hasBackreference
+    1:15:boolean hasUnusualCharacters():2135:2149 -> hasUnusualCharacters
+    1:1:boolean isMatchAllNames():2126:2126 -> isMatchAllNames
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2122:2122 -> 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):2154:2156 -> <init>
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2160:2162 -> <init>
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType:
-    1:3:void <clinit>():189:191 -> <clinit>
-    4:4:void <clinit>():188:188 -> <clinit>
-    1:1:void <init>(java.lang.String,int):188:188 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType valueOf(java.lang.String):188:188 -> valueOf
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType[] values():188:188 -> values
+    1:3:void <clinit>():188:190 -> <clinit>
+    4:4:void <clinit>():187:187 -> <clinit>
+    1:1:void <init>(java.lang.String,int):187:187 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType valueOf(java.lang.String):187:187 -> valueOf
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType[] values():187:187 -> values
 com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser:
-    1:1:void <clinit>():194:194 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):204:204 -> <init>
-    2:1463:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):197:1658 -> <init>
-    1464:1467:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):206:209 -> <init>
-    1:7:boolean acceptArobaseInclude():574:580 -> acceptArobaseInclude
-    1:2:boolean acceptChar(char):1567:1568 -> acceptChar
-    1:1:java.lang.String acceptClassName():1666:1666 -> acceptClassName
-    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1798:1819 -> acceptFieldNameOrIntegerForReturn
-    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1671:1676 -> acceptIdentifierWithBackreference
-    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1681:1707 -> acceptIdentifierWithBackreference
-    34:35:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1702:1703 -> acceptIdentifierWithBackreference
-    36:38:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    36:38:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1702 -> acceptIdentifierWithBackreference
-    39:41:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1710:1712 -> acceptIdentifierWithBackreference
-    42:44:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    42:44:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1710 -> acceptIdentifierWithBackreference
-    45:51:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1716:1722 -> acceptIdentifierWithBackreference
-    52:54:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    52:54:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1721 -> acceptIdentifierWithBackreference
-    55:98:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1733:1776 -> acceptIdentifierWithBackreference
-    99:101:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    99:101:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1772 -> acceptIdentifierWithBackreference
-    102:102:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1766:1766 -> acceptIdentifierWithBackreference
-    103:130:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1761:1788 -> acceptIdentifierWithBackreference
-    131:133:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> acceptIdentifierWithBackreference
-    131:133:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1787 -> acceptIdentifierWithBackreference
-    134:135:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1793:1794 -> acceptIdentifierWithBackreference
-    1:5:java.lang.Integer acceptInteger():1641:1645 -> acceptInteger
-    1:1:java.lang.String acceptPattern():1856:1856 -> acceptPattern
-    1:28:java.util.List acceptPatternList():1823:1850 -> acceptPatternList
-    1:1:char acceptQuoteIfPresent():1576:1576 -> acceptQuoteIfPresent
-    1:4:java.lang.String acceptQuotedOrUnquotedString():1632:1635 -> acceptQuotedOrUnquotedString
-    1:9:boolean acceptString(java.lang.String):1615:1623 -> acceptString
-    10:10:java.lang.String acceptString():1628:1628 -> acceptString
-    11:25:java.lang.String acceptString(java.util.function.Predicate):1865:1879 -> acceptString
-    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1320:1329 -> checkConstructorPattern
-    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1326:1326 -> checkConstructorPattern
-    1:1:boolean eof():1541:1541 -> eof
-    2:2:boolean eof(int):1545:1545 -> eof
-    1:2:void expectChar(char):1609:1610 -> expectChar
-    1:5:void expectClosingQuote(char):1580:1584 -> expectClosingQuote
-    6:6:void expectClosingQuote(char):1582:1582 -> expectClosingQuote
-    1:1:int getColumn():2085:2085 -> getColumn
-    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2073:2076 -> getPosition
-    5:5:com.android.tools.r8.position.TextPosition getPosition():2081:2081 -> getPosition
-    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2089:2090 -> getSourceSnippet
-    1:4:boolean hasNextChar(char):1549:1552 -> hasNextChar
-    5:8:boolean hasNextChar(java.util.function.Predicate):1556:1559 -> hasNextChar
-    1:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2068:2068 -> infoIgnoringModifier
-    1:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2043:2043 -> infoIgnoringOptions
-    1:2:boolean isInteger(java.lang.String):1532:1533 -> isInteger
-    1:1:boolean isOptionalArgumentGiven():1563:1563 -> isOptionalArgumentGiven
-    1:4:boolean lambda$acceptPattern$7(java.lang.Integer):1858:1861 -> lambda$acceptPattern$7
-    1:1:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1633:1633 -> lambda$acceptQuotedOrUnquotedString$4
-    1:1:boolean lambda$acceptString$3(java.lang.Integer):1628:1628 -> lambda$acceptString$3
-    1:7:boolean lambda$new$5(java.lang.Integer):1650:1656 -> lambda$new$5
-    1:4:boolean lambda$new$6(java.lang.Integer):1660:1663 -> lambda$new$6
-    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1465:1466 -> lambda$parseFileFilter$2
-    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1407:1410 -> lambda$parseFileName$1
-    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):666:666 -> lambda$skipOptimizationName$0
-    1:6:void parse():214:219 -> parse
-    7:12:void parse():218:223 -> parse
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():963:975 -> parseAnnotation
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():974:974 -> parseAnnotation
-    1:12:java.util.List parseArgumentList():1335:1346 -> parseArgumentList
-    13:22:java.util.List parseArgumentList():1343:1352 -> parseArgumentList
-    23:25:java.util.List parseArgumentList():1351:1353 -> parseArgumentList
-    26:33:java.util.List parseArgumentList():1350:1357 -> parseArgumentList
-    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1488:1493 -> parseAssumeMayHaveSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1475:1482 -> parseAssumeNoSideEffectsRule
-    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1498:1505 -> parseAssumeValuesRule
-    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):717:724 -> parseCheckDiscardRule
-    1:6:void parseClassFilter(java.util.function.Consumer):1911:1916 -> parseClassFilter
-    7:7:void parseClassFilter(java.util.function.Consumer):1915:1915 -> parseClassFilter
-    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):988:1010 -> parseClassFlagsAndAnnotations
-    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):730:735 -> parseClassInlineRule
-    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):741:746 -> parseClassMergingRule
-    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1943:1945 -> parseClassName
-    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1950:1953 -> parseClassName
-    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1922:1925 -> parseClassNameAddToBuilder
-    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1923:1926 -> parseClassNameAddToBuilder
-    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1930:1934 -> parseClassNames
-    1:10:java.util.List parseClassPath():1427:1436 -> parseClassPath
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1442:1455 -> parseClassPathFilters
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1452:1457 -> parseClassPathFilters
-    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):896:900 -> parseClassSpec
-    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1023:1042 -> parseClassType
-    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1018:1019 -> parseClassTypeUnexpected
-    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):814:819 -> parseConstantArgumentRule
-    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2023:2023 -> parseError
-    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):2027:2027 -> parseError
-    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2033:2034 -> parseError
-    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2038:2039 -> parseError
-    1:7:java.lang.String parseFileFilter():1462:1468 -> parseFileFilter
-    1:22:java.nio.file.Path parseFileName(boolean):1397:1418 -> parseFileName
-    23:30:java.nio.file.Path parseFileName(boolean):1416:1423 -> parseFileName
-    31:31:java.nio.file.Path parseFileName(boolean):1412:1412 -> parseFileName
-    32:32:java.nio.file.Path parseFileName(boolean):1401:1401 -> parseFileName
-    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):777:784 -> parseIdentifierNameStringRule
-    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):789:808 -> parseIfRule
-    21:23:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> parseIfRule
-    21:23:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):807 -> parseIfRule
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):550:552 -> parseIgnoredOption
-    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):551:555 -> parseIgnoredOption
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):530:537 -> parseIgnoredOptionAndWarn
-    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):536:544 -> parseIgnoredOptionAndWarn
-    1:10:void parseInclude():559:568 -> parseInclude
-    11:11:void parseInclude():565:565 -> parseInclude
-    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1048:1058 -> parseInheritance
-    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1057:1057 -> parseInheritance
-    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):763:771 -> parseInlineRule
-    1:5:void parseKeepAttributes():585:589 -> parseKeepAttributes
-    6:6:void parseKeepAttributes():587:587 -> parseKeepAttributes
-    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):682:692 -> parseKeepRule
-    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):691:700 -> parseKeepRule
-    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1090:1139 -> parseMemberAccessFlags
-    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1127:1144 -> parseMemberAccessFlags
-    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1118:1123 -> parseMemberAccessFlags
-    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1113:1114 -> parseMemberAccessFlags
-    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1108:1109 -> parseMemberAccessFlags
-    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1103:1104 -> parseMemberAccessFlags
-    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1098:1154 -> parseMemberAccessFlags
-    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1162:1207 -> parseMemberPattern
-    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1202:1218 -> parseMemberPattern
-    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1213:1235 -> parseMemberPattern
-    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1234:1248 -> parseMemberPattern
-    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1247:1279 -> parseMemberPattern
-    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1278:1278 -> parseMemberPattern
-    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1276:1288 -> parseMemberPattern
-    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1287:1287 -> parseMemberPattern
-    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1286:1291 -> parseMemberPattern
-    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1290:1313 -> parseMemberPattern
-    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1080:1085 -> parseMemberRule
-    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1067:1074 -> parseMemberRules
-    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):753:758 -> parseMemberValuePropagationRule
-    1:2:boolean parseNegation():981:982 -> parseNegation
-    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):646:654 -> parseOptimizationOption
-    1:51:boolean parseOption():227:277 -> parseOption
-    52:53:boolean parseOption():274:275 -> parseOption
-    54:56:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> parseOption
-    54:56:boolean parseOption():274 -> parseOption
-    57:141:boolean parseOption():278:362 -> parseOption
-    142:199:boolean parseOption():361:418 -> parseOption
-    1:10:void parsePackageFilter(java.util.function.BiConsumer):1892:1901 -> parsePackageFilter
-    11:14:void parsePackageFilter(java.util.function.BiConsumer):1900:1903 -> parsePackageFilter
-    15:22:void parsePackageFilter(java.util.function.BiConsumer):1898:1905 -> parsePackageFilter
-    1:1:java.lang.String parsePackageNameOrEmptyString():1938:1938 -> parsePackageNameOrEmptyString
-    1:5:void parsePathFilter(java.util.function.Consumer):1964:1968 -> parsePathFilter
-    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1973:1992 -> parsePathFilter
-    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1989:1994 -> parsePathFilter
-    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1979:1979 -> parsePathFilter
-    1:6:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):837:842 -> parseReprocessClassInitializerRule
-    1:6:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):848:853 -> parseReprocessMethodRule
-    1:18:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):941:958 -> parseRuleModifiers
-    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):904:937 -> parseRuleTypeAndModifiers
-    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):425:478 -> parseTestingOption
-    55:62:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):477:484 -> parseTestingOption
-    63:69:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483:489 -> parseTestingOption
-    70:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488:495 -> parseTestingOption
-    78:84:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494:500 -> parseTestingOption
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):519:522 -> parseUnsupportedOptionAndErr
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):521:521 -> parseUnsupportedOptionAndErr
-    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):825:830 -> parseUnusedArgumentRule
-    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):705:712 -> parseWhyAreYouKeepingRule
-    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):859:864 -> parseWhyAreYouNotInliningRule
-    1:1:boolean pathFilterMatcher(java.lang.Integer):1959:1959 -> pathFilterMatcher
-    1:1:char peekChar():1592:1592 -> peekChar
-    1:2:char peekCharAt(int):1596:1597 -> peekCharAt
-    1:1:char readChar():1601:1601 -> readChar
-    1:1:int remainingChars():1605:1605 -> remainingChars
-    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1363:1383 -> replaceSystemPropertyReferences
-    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1381:1393 -> replaceSystemPropertyReferences
-    1:8:void skipComment():1520:1527 -> skipComment
-    1:3:boolean skipFlag(java.lang.String):593:595 -> skipFlag
-    1:11:void skipOptimizationName():659:669 -> skipOptimizationName
-    1:10:boolean skipOptionWithClassSpec(java.lang.String):628:637 -> skipOptionWithClassSpec
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):614:620 -> skipOptionWithOptionalSingleArg
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):603:607 -> skipOptionWithSingleArg
-    1:3:void skipSingleArgument():674:676 -> skipSingleArgument
-    1:8:void skipWhitespace():1509:1516 -> skipWhitespace
-    1:10:java.lang.String snippetForPosition():1999:2008 -> snippetForPosition
-    11:17:java.lang.String snippetForPosition():2004:2010 -> snippetForPosition
-    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2015:2018 -> snippetForPosition
-    1:4:void unacceptString(java.lang.String):1883:1886 -> unacceptString
-    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):508:508 -> unknownOption
-    2:4:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):513:515 -> unknownOption
-    5:7:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> unknownOption
-    5:7:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):513 -> unknownOption
-    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):868:880 -> verifyAndLinkBackReferences
-    14:17:void verifyAndLinkBackReferences(java.lang.Iterable):875:878 -> verifyAndLinkBackReferences
-    18:20:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> verifyAndLinkBackReferences
-    18:20:void verifyAndLinkBackReferences(java.lang.Iterable):875 -> verifyAndLinkBackReferences
-    21:23:void verifyAndLinkBackReferences(java.lang.Iterable):882:884 -> verifyAndLinkBackReferences
-    1:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2048:2048 -> warnIgnoringOptions
-    1:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2053:2053 -> warnOverridingOptions
-    1:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2059:2059 -> warnUnusualCharacters
+    1:1:void <clinit>():193:193 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):203:203 -> <init>
+    2:1470:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):196:1664 -> <init>
+    1471:1474:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):205:208 -> <init>
+    1:7:boolean acceptArobaseInclude():579:585 -> acceptArobaseInclude
+    1:2:boolean acceptChar(char):1573:1574 -> acceptChar
+    1:1:java.lang.String acceptClassName():1672:1672 -> acceptClassName
+    1:22:java.lang.String acceptFieldNameOrIntegerForReturn():1804:1825 -> acceptFieldNameOrIntegerForReturn
+    1:6:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1677:1682 -> acceptIdentifierWithBackreference
+    7:33:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1687:1713 -> acceptIdentifierWithBackreference
+    34:36:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1708:1708 -> acceptIdentifierWithBackreference
+    44:47:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1716:1716 -> acceptIdentifierWithBackreference
+    53:59:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1722:1728 -> acceptIdentifierWithBackreference
+    60:115:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1727:1782 -> acceptIdentifierWithBackreference
+    116:116:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1778:1778 -> acceptIdentifierWithBackreference
+    117:117:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1772:1772 -> acceptIdentifierWithBackreference
+    118:145:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1767:1794 -> acceptIdentifierWithBackreference
+    146:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1793:1800 -> acceptIdentifierWithBackreference
+    1:5:java.lang.Integer acceptInteger():1647:1651 -> acceptInteger
+    1:1:java.lang.String acceptPattern():1862:1862 -> acceptPattern
+    1:28:java.util.List acceptPatternList():1829:1856 -> acceptPatternList
+    1:1:char acceptQuoteIfPresent():1582:1582 -> acceptQuoteIfPresent
+    1:4:java.lang.String acceptQuotedOrUnquotedString():1638:1641 -> acceptQuotedOrUnquotedString
+    1:9:boolean acceptString(java.lang.String):1621:1629 -> acceptString
+    10:10:java.lang.String acceptString():1634:1634 -> acceptString
+    11:25:java.lang.String acceptString(java.util.function.Predicate):1871:1885 -> acceptString
+    1:10:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1326:1335 -> checkConstructorPattern
+    11:11:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1332:1332 -> checkConstructorPattern
+    1:1:boolean eof():1547:1547 -> eof
+    2:2:boolean eof(int):1551:1551 -> eof
+    1:2:void expectChar(char):1615:1616 -> expectChar
+    1:5:void expectClosingQuote(char):1586:1590 -> expectClosingQuote
+    6:6:void expectClosingQuote(char):1588:1588 -> expectClosingQuote
+    1:1:int getColumn():2091:2091 -> getColumn
+    1:4:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2079:2082 -> getPosition
+    5:5:com.android.tools.r8.position.TextPosition getPosition():2087:2087 -> getPosition
+    1:2:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2095:2096 -> getSourceSnippet
+    1:4:boolean hasNextChar(char):1555:1558 -> hasNextChar
+    5:8:boolean hasNextChar(java.util.function.Predicate):1562:1565 -> hasNextChar
+    1:3:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2074:2074 -> infoIgnoringModifier
+    1:3:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2049:2049 -> infoIgnoringOptions
+    1:2:boolean isInteger(java.lang.String):1538:1539 -> isInteger
+    1:1:boolean isOptionalArgumentGiven():1569:1569 -> isOptionalArgumentGiven
+    1:4:boolean lambda$acceptPattern$7(java.lang.Integer):1864:1867 -> lambda$acceptPattern$7
+    1:1:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1639:1639 -> lambda$acceptQuotedOrUnquotedString$4
+    1:1:boolean lambda$acceptString$3(java.lang.Integer):1634:1634 -> lambda$acceptString$3
+    1:7:boolean lambda$new$5(java.lang.Integer):1656:1662 -> lambda$new$5
+    1:4:boolean lambda$new$6(java.lang.Integer):1666:1669 -> lambda$new$6
+    1:2:boolean lambda$parseFileFilter$2(java.lang.Integer):1471:1472 -> lambda$parseFileFilter$2
+    1:4:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1413:1416 -> lambda$parseFileName$1
+    1:1:boolean lambda$skipOptimizationName$0(java.lang.Integer):670:670 -> lambda$skipOptimizationName$0
+    1:6:void parse():213:218 -> parse
+    7:12:void parse():217:222 -> parse
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():969:981 -> parseAnnotation
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():980:980 -> parseAnnotation
+    1:12:java.util.List parseArgumentList():1341:1352 -> parseArgumentList
+    13:22:java.util.List parseArgumentList():1349:1358 -> parseArgumentList
+    23:25:java.util.List parseArgumentList():1357:1359 -> parseArgumentList
+    26:33:java.util.List parseArgumentList():1356:1363 -> parseArgumentList
+    1:6:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1494:1499 -> parseAssumeMayHaveSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1481:1488 -> parseAssumeNoSideEffectsRule
+    1:8:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1504:1511 -> parseAssumeValuesRule
+    1:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):721:728 -> parseCheckDiscardRule
+    1:6:void parseClassFilter(java.util.function.Consumer):1917:1922 -> parseClassFilter
+    7:7:void parseClassFilter(java.util.function.Consumer):1921:1921 -> parseClassFilter
+    1:23:void parseClassFlagsAndAnnotations(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):994:1016 -> parseClassFlagsAndAnnotations
+    1:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):734:739 -> parseClassInlineRule
+    1:6:com.android.tools.r8.shaking.ClassMergingRule parseClassMergingRule(com.android.tools.r8.shaking.ClassMergingRule$Type,com.android.tools.r8.position.Position):745:750 -> parseClassMergingRule
+    1:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1949:1951 -> parseClassName
+    4:7:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):1956:1959 -> parseClassName
+    1:4:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1928:1931 -> parseClassNameAddToBuilder
+    5:8:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1929:1932 -> parseClassNameAddToBuilder
+    1:5:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1936:1940 -> parseClassNames
+    1:10:java.util.List parseClassPath():1433:1442 -> parseClassPath
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1448:1461 -> parseClassPathFilters
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1458:1463 -> parseClassPathFilters
+    1:5:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):900:904 -> parseClassSpec
+    1:20:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1029:1048 -> parseClassType
+    1:2:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1024:1025 -> parseClassTypeUnexpected
+    1:6:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):818:823 -> parseConstantArgumentRule
+    1:1:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2029:2029 -> parseError
+    2:2:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,java.lang.Throwable):2033:2033 -> parseError
+    3:4:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2039:2040 -> parseError
+    5:6:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2044:2045 -> parseError
+    1:7:java.lang.String parseFileFilter():1468:1474 -> parseFileFilter
+    1:22:java.nio.file.Path parseFileName(boolean):1403:1424 -> parseFileName
+    23:30:java.nio.file.Path parseFileName(boolean):1422:1429 -> parseFileName
+    31:31:java.nio.file.Path parseFileName(boolean):1418:1418 -> parseFileName
+    32:32:java.nio.file.Path parseFileName(boolean):1407:1407 -> parseFileName
+    1:8:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):781:788 -> parseIdentifierNameStringRule
+    1:20:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):793:812 -> parseIfRule
+    21:21:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):811:811 -> parseIfRule
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):555:557 -> parseIgnoredOption
+    4:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):556:560 -> parseIgnoredOption
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):535:542 -> parseIgnoredOptionAndWarn
+    9:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):541:549 -> parseIgnoredOptionAndWarn
+    1:10:void parseInclude():564:573 -> parseInclude
+    11:11:void parseInclude():570:570 -> parseInclude
+    1:11:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1054:1064 -> parseInheritance
+    12:12:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1063:1063 -> parseInheritance
+    1:9:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):767:775 -> parseInlineRule
+    1:5:void parseKeepAttributes():590:594 -> parseKeepAttributes
+    6:6:void parseKeepAttributes():592:592 -> parseKeepAttributes
+    1:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):686:696 -> parseKeepRule
+    12:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):695:704 -> parseKeepRule
+    1:50:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1096:1145 -> parseMemberAccessFlags
+    51:68:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1133:1150 -> parseMemberAccessFlags
+    69:74:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1124:1129 -> parseMemberAccessFlags
+    75:76:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1119:1120 -> parseMemberAccessFlags
+    77:78:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1114:1115 -> parseMemberAccessFlags
+    79:80:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1109:1110 -> parseMemberAccessFlags
+    81:137:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1104:1160 -> parseMemberAccessFlags
+    1:46:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1168:1213 -> parseMemberPattern
+    47:63:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1208:1224 -> parseMemberPattern
+    64:86:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1219:1241 -> parseMemberPattern
+    87:101:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1240:1254 -> parseMemberPattern
+    102:134:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1253:1285 -> parseMemberPattern
+    135:135:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1284:1284 -> parseMemberPattern
+    136:148:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1282:1294 -> parseMemberPattern
+    149:149:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1293:1293 -> parseMemberPattern
+    150:155:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1292:1297 -> parseMemberPattern
+    156:179:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1296:1319 -> parseMemberPattern
+    1:6:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1086:1091 -> parseMemberRule
+    1:8:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1073:1080 -> parseMemberRules
+    1:6:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):757:762 -> parseMemberValuePropagationRule
+    1:2:boolean parseNegation():987:988 -> parseNegation
+    1:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):650:658 -> parseOptimizationOption
+    1:19:boolean parseOption():226:244 -> parseOption
+    20:62:boolean parseOption():240:282 -> parseOption
+    63:65:boolean parseOption():279:279 -> parseOption
+    69:153:boolean parseOption():283:367 -> parseOption
+    154:211:boolean parseOption():366:423 -> parseOption
+    1:10:void parsePackageFilter(java.util.function.BiConsumer):1898:1907 -> parsePackageFilter
+    11:14:void parsePackageFilter(java.util.function.BiConsumer):1906:1909 -> parsePackageFilter
+    15:22:void parsePackageFilter(java.util.function.BiConsumer):1904:1911 -> parsePackageFilter
+    1:1:java.lang.String parsePackageNameOrEmptyString():1944:1944 -> parsePackageNameOrEmptyString
+    1:5:void parsePathFilter(java.util.function.Consumer):1970:1974 -> parsePathFilter
+    6:25:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1979:1998 -> parsePathFilter
+    26:31:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1995:2000 -> parsePathFilter
+    32:32:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():1985:1985 -> parsePathFilter
+    1:6:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):841:846 -> parseReprocessClassInitializerRule
+    1:6:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):852:857 -> parseReprocessMethodRule
+    1:20:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):945:964 -> parseRuleModifiers
+    1:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):908:941 -> parseRuleTypeAndModifiers
+    1:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):430:483 -> parseTestingOption
+    55:62:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):482:489 -> parseTestingOption
+    63:69:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488:494 -> parseTestingOption
+    70:77:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):493:500 -> parseTestingOption
+    78:84:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499:505 -> parseTestingOption
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):524:527 -> parseUnsupportedOptionAndErr
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):526:526 -> parseUnsupportedOptionAndErr
+    1:6:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):829:834 -> parseUnusedArgumentRule
+    1:8:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):709:716 -> parseWhyAreYouKeepingRule
+    1:6:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):863:868 -> parseWhyAreYouNotInliningRule
+    1:1:boolean pathFilterMatcher(java.lang.Integer):1965:1965 -> pathFilterMatcher
+    1:1:char peekChar():1598:1598 -> peekChar
+    1:2:char peekCharAt(int):1602:1603 -> peekCharAt
+    1:1:char readChar():1607:1607 -> readChar
+    1:1:int remainingChars():1611:1611 -> remainingChars
+    1:21:java.lang.String replaceSystemPropertyReferences(java.lang.String):1369:1389 -> replaceSystemPropertyReferences
+    22:34:java.lang.String replaceSystemPropertyReferences(java.lang.String):1387:1399 -> replaceSystemPropertyReferences
+    1:8:void skipComment():1526:1533 -> skipComment
+    1:3:boolean skipFlag(java.lang.String):598:600 -> skipFlag
+    1:11:void skipOptimizationName():663:673 -> skipOptimizationName
+    1:10:boolean skipOptionWithClassSpec(java.lang.String):633:642 -> skipOptionWithClassSpec
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):619:625 -> skipOptionWithOptionalSingleArg
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):608:612 -> skipOptionWithSingleArg
+    1:3:void skipSingleArgument():678:680 -> skipSingleArgument
+    1:8:void skipWhitespace():1515:1522 -> skipWhitespace
+    1:10:java.lang.String snippetForPosition():2005:2014 -> snippetForPosition
+    11:17:java.lang.String snippetForPosition():2010:2016 -> snippetForPosition
+    18:21:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2021:2024 -> snippetForPosition
+    1:4:void unacceptString(java.lang.String):1889:1892 -> unacceptString
+    1:1:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):513:513 -> unknownOption
+    2:5:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):518:518 -> unknownOption
+    1:13:void verifyAndLinkBackReferences(java.lang.Iterable):872:884 -> verifyAndLinkBackReferences
+    14:18:void verifyAndLinkBackReferences(java.lang.Iterable):879:879 -> verifyAndLinkBackReferences
+    25:27:void verifyAndLinkBackReferences(java.lang.Iterable):886:888 -> verifyAndLinkBackReferences
+    1:3:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2054:2054 -> warnIgnoringOptions
+    1:3:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2059:2059 -> warnOverridingOptions
+    1:7:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2065:2065 -> warnUnusualCharacters
 com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.ProguardConfigurationRule:
     1:1:void <clinit>():22:22 -> <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):40:40 -> <init>
     2:2: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):24:24 -> <init>
-    1:5:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):161:165 -> append
-    1:14:boolean equals(java.lang.Object):134:147 -> equals
-    1:12:java.lang.Iterable getWildcards():117:128 -> getWildcards
+    1:5:java.lang.StringBuilder append(java.lang.StringBuilder,boolean):169:173 -> append
+    1:14:boolean equals(java.lang.Object):142:155 -> equals
+    1:12:java.lang.Iterable getWildcards():125:136 -> getWildcards
     13:13:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable[]):487:487 -> getWildcards
-    13:13:java.lang.Iterable getWildcards():118 -> getWildcards
-    1:5:int hashCode():152:156 -> hashCode
+    13:13:java.lang.Iterable getWildcards():126 -> getWildcards
+    1:5:int hashCode():160:164 -> hashCode
     1:1:boolean isUsed():46:46 -> isUsed
-    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):126:126 -> lambda$getWildcards$0
+    1:1:java.util.stream.Stream lambda$getWildcards$0(java.lang.Iterable):134:134 -> lambda$getWildcards$0
     1:1:void markAsUsed():50:50 -> markAsUsed
-    1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):89:93 -> relevantCandidatesForRule
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> relevantCandidatesForRule
-    6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):94 -> relevantCandidatesForRule
-    7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):95:98 -> relevantCandidatesForRule
+    1:5:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):97:101 -> relevantCandidatesForRule
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> relevantCandidatesForRule
+    6:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):102 -> relevantCandidatesForRule
+    7:10:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):103:106 -> 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
-    11:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):96 -> relevantCandidatesForRule
-    12:12:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):100:100 -> relevantCandidatesForRule
+    11:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):104 -> relevantCandidatesForRule
+    12:12:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):108:108 -> relevantCandidatesForRule
 com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.shaking.ProguardConfigurationSourceBytes:
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
     4:4:void <init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> <init>
@@ -62935,31 +63925,32 @@
 com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.ProguardIfRule:
     1:2:void <clinit>():18:19 -> <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,com.android.tools.r8.shaking.ProguardKeepRule,java.util.Set,com.android.tools.r8.shaking.ProguardIfRule$1):16:16 -> <init>
-    2:6: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.ProguardKeepRule,java.util.Set):88:88 -> <init>
-    10:11: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.ProguardKeepRule,java.util.Set):92:93 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():97:97 -> builder
-    1:8:boolean equals(java.lang.Object):207:214 -> equals
+    2:6: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.ProguardKeepRule,java.util.Set):92:92 -> <init>
+    10:11: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.ProguardKeepRule,java.util.Set):96:97 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():101:101 -> builder
+    1:8:boolean equals(java.lang.Object):221:228 -> equals
     1:1:java.util.Set getPreconditions():30:30 -> getPreconditions
-    1:1:java.lang.Iterable getWildcards():102:102 -> getWildcards
+    1:1:com.android.tools.r8.shaking.ProguardKeepRule getSubsequentRule():34:34 -> getSubsequentRule
+    1:1:java.lang.Iterable getWildcards():106:106 -> getWildcards
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> getWildcards
-    2:2:java.lang.Iterable getWildcards():102 -> getWildcards
-    1:1:int hashCode():219:219 -> hashCode
-    1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$materialize$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):127:127 -> lambda$materialize$0
-    1:1:boolean lambda$neverInlineRuleForCondition$1(com.android.tools.r8.shaking.ProguardMemberRule):199:199 -> lambda$neverInlineRuleForCondition$1
-    1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$neverInlineRuleForCondition$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):200:200 -> lambda$neverInlineRuleForCondition$2
-    1:23:com.android.tools.r8.shaking.ProguardIfRule materialize(com.android.tools.r8.graph.DexItemFactory,java.util.Set):107:129 -> materialize
-    1:18:com.android.tools.r8.shaking.ClassInlineRule neverClassInlineRuleForCondition(com.android.tools.r8.graph.DexItemFactory):134:151 -> neverClassInlineRuleForCondition
-    1:24:com.android.tools.r8.shaking.InlineRule neverInlineRuleForCondition(com.android.tools.r8.graph.DexItemFactory):178:201 -> neverInlineRuleForCondition
+    2:2:java.lang.Iterable getWildcards():106 -> getWildcards
+    1:1:int hashCode():233:233 -> hashCode
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$materialize$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):141:141 -> lambda$materialize$0
+    1:1:boolean lambda$neverInlineRuleForCondition$1(com.android.tools.r8.shaking.ProguardMemberRule):213:213 -> lambda$neverInlineRuleForCondition$1
+    1:1:com.android.tools.r8.shaking.ProguardMemberRule lambda$neverInlineRuleForCondition$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardMemberRule):214:214 -> lambda$neverInlineRuleForCondition$2
+    1:23:com.android.tools.r8.shaking.ProguardIfRule materialize(com.android.tools.r8.graph.DexItemFactory,java.util.Set):121:143 -> materialize
+    1:18:com.android.tools.r8.shaking.ClassInlineRule neverClassInlineRuleForCondition(com.android.tools.r8.graph.DexItemFactory):148:165 -> neverClassInlineRuleForCondition
+    1:24:com.android.tools.r8.shaking.InlineRule neverInlineRuleForCondition(com.android.tools.r8.graph.DexItemFactory):192:215 -> neverInlineRuleForCondition
 com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.ProguardIfRule$1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
 com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.ProguardIfRule$Builder:
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>():38:38 -> <init>
-    2:2:void <init>():35:35 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardClassSpecification build():33:33 -> build
-    2:5:com.android.tools.r8.shaking.ProguardIfRule build():52:55 -> build
-    1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():33:33 -> self
-    1:1:void setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):47:47 -> setSubsequentRule
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>():42:42 -> <init>
+    2:2:void <init>():39:39 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification build():37:37 -> build
+    2:5:com.android.tools.r8.shaking.ProguardIfRule build():56:59 -> build
+    1:1:com.android.tools.r8.shaking.ProguardClassSpecification$Builder self():37:37 -> self
+    1:1:void setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):51:51 -> setSubsequentRule
 com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.shaking.ProguardKeepAttributes:
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>():58:58 -> <init>
@@ -63019,22 +64010,23 @@
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> setType
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder updateModifiers(java.util.function.Consumer):34:35 -> updateModifiers
 com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.ProguardKeepRuleModifiers:
-    1:1:void <init>(boolean,boolean,boolean,boolean,com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1):6:6 -> <init>
-    2:6:void <init>(boolean,boolean,boolean,boolean):48:52 -> <init>
-    1:4:void appendWithComma(java.lang.StringBuilder,boolean,java.lang.String):97:100 -> appendWithComma
-    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder builder():58:58 -> builder
-    1:6:boolean equals(java.lang.Object):63:68 -> equals
-    1:4:int hashCode():76:79 -> hashCode
-    1:6:java.lang.String toString():84:89 -> toString
+    1:1:void <init>(boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1):6:6 -> <init>
+    2:7:void <init>(boolean,boolean,boolean,boolean,boolean):60:65 -> <init>
+    1:4:void appendWithComma(java.lang.StringBuilder,boolean,java.lang.String):112:115 -> appendWithComma
+    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder builder():72:72 -> builder
+    1:5:boolean equals(java.lang.Object):77:81 -> equals
+    1:5:int hashCode():90:94 -> hashCode
+    1:7:java.lang.String toString():99:105 -> toString
 com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1):7:7 -> <init>
-    2:2:void <init>():14:14 -> <init>
-    3:6:void <init>():9:12 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers build():34:34 -> build
-    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsObfuscation(boolean):25:25 -> setAllowsObfuscation
-    1:1:void setAllowsOptimization(boolean):21:21 -> setAllowsOptimization
-    1:1:void setAllowsShrinking(boolean):17:17 -> setAllowsShrinking
-    1:1:void setIncludeDescriptorClasses(boolean):30:30 -> setIncludeDescriptorClasses
+    2:2:void <init>():15:15 -> <init>
+    3:7:void <init>():9:13 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers build():40:40 -> build
+    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsAccessModification(boolean):18:18 -> setAllowsAccessModification
+    1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsObfuscation(boolean):31:31 -> setAllowsObfuscation
+    1:1:void setAllowsOptimization(boolean):27:27 -> setAllowsOptimization
+    1:1:void setAllowsShrinking(boolean):23:23 -> setAllowsShrinking
+    1:1:void setIncludeDescriptorClasses(boolean):36:36 -> setIncludeDescriptorClasses
 com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.shaking.ProguardKeepRuleType:
     1:4:void <clinit>():9:12 -> <clinit>
     5:5:void <clinit>():8:8 -> <clinit>
@@ -63403,10 +64395,10 @@
     1:1:com.android.tools.r8.graph.DexDefinition access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):78:78 -> access$600
     1:1:void access$700(com.android.tools.r8.shaking.RootSetBuilder,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):78:78 -> access$700
     1:21: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):1033:1053 -> addItemToSets
-    22:22:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):190:190 -> addItemToSets
+    22:22:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):191:191 -> 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):1053 -> 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):1059:1062 -> addItemToSets
-    27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> addItemToSets
+    27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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):1062 -> 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):1063:1068 -> addItemToSets
     34: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):1065:1144 -> addItemToSets
@@ -63428,7 +64420,7 @@
     2:13:boolean containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexEncodedMember,java.util.function.Consumer):907:918 -> containsAnnotation
     14:18:com.android.tools.r8.shaking.AnnotationMatchResult containsAnnotation(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):929:933 -> containsAnnotation
     1:10:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):990:999 -> includeDescriptor
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> includeDescriptor
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> includeDescriptor
     11:11:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):999 -> includeDescriptor
     12:21:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1000:1009 -> includeDescriptor
     1:11:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1013:1023 -> includeDescriptorClasses
@@ -63437,7 +64429,7 @@
     1:1:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexReference):1095:1095 -> lambda$addItemToSets$16
     1:1:java.util.Set lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1098:1098 -> lambda$addItemToSets$17
     1:1:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):850:850 -> lambda$anySourceMatchesInheritanceRuleDirectly$11
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> lambda$anySourceMatchesInheritanceRuleDirectly$11
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> lambda$anySourceMatchesInheritanceRuleDirectly$11
     2:2:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):850 -> lambda$anySourceMatchesInheritanceRuleDirectly$11
     3:3:boolean lambda$anySourceMatchesInheritanceRuleDirectly$11(boolean,com.android.tools.r8.graph.DexType):850:850 -> lambda$anySourceMatchesInheritanceRuleDirectly$11
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):1005:1005 -> lambda$includeDescriptor$12
@@ -63461,7 +64453,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):682:682 -> 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):649:649 -> markMatchingMethods
     1:11:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):615:625 -> markMatchingOverriddenMethods
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> markMatchingOverriddenMethods
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> markMatchingOverriddenMethods
     12:12:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):625 -> markMatchingOverriddenMethods
     13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):629:639 -> 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):664:672 -> markMatchingVisibleFields
@@ -63485,7 +64477,7 @@
     1:3:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):876:878 -> ruleSatisfiedByMethods
     1:33:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):289:321 -> run
     34:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):320:348 -> run
-    63:63:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):305:305 -> run
+    63:64:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):305:306 -> run
     1:16:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):259:274 -> runPerRule
     17:17:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):273:273 -> runPerRule
     1:2:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):747:748 -> satisfyAccessFlag
@@ -63507,69 +64499,72 @@
     6:6:void <clinit>():1133:1133 -> <clinit>
     7:7:void <clinit>():171:171 -> <clinit>
 com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet:
-    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map,java.util.List):1758:1758 -> <init>
-    1:1:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1748:1748 -> forEachClassWithDependentItems
-    1:1:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1748:1748 -> forEachDependentInstanceConstructor
-    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1748:1748 -> forEachDependentNonStaticMember
-    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1748:1748 -> forEachDependentStaticMember
-    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1748:1748 -> forEachMemberWithDependentItems
+    1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map,java.util.List):1762:1762 -> <init>
+    1:1:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1752:1752 -> forEachClassWithDependentItems
+    1:1:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1752:1752 -> forEachDependentInstanceConstructor
+    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1752:1752 -> forEachDependentNonStaticMember
+    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1752:1752 -> forEachDependentStaticMember
+    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1752:1752 -> forEachMemberWithDependentItems
+    1:1:boolean noShrinking(com.android.tools.r8.graph.DexReference):1752:1752 -> noShrinking
 com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.RootSetBuilder$RootSet:
-    1:1:void <clinit>():1375:1375 -> <clinit>
-    1:1:void <init>(java.util.Map,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,com.android.tools.r8.utils.PredicateSet,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):1375:1375 -> <init>
-    2:27:void <init>(java.util.Map,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,com.android.tools.r8.utils.PredicateSet,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):1422:1447 -> <init>
-    1:13:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1467:1479 -> addConsequentRootSet
-    1:1:void addDependentItems(java.util.Map):1485:1485 -> addDependentItems
-    1:9:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1451:1459 -> checkAllRulesAreUsed
-    1:11:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1493:1503 -> copy
-    1:1:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1375:1375 -> forEachClassWithDependentItems
-    1:1:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1375:1375 -> forEachDependentInstanceConstructor
-    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1375:1375 -> forEachDependentNonStaticMember
-    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1375:1375 -> forEachDependentStaticMember
-    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1375:1375 -> forEachMemberWithDependentItems
-    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1628:1636 -> isKeptDirectlyOrIndirectly
-    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1472:1472 -> lambda$addConsequentRootSet$0
-    1:1:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1472:1472 -> lambda$addConsequentRootSet$1
-    1:1:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1478:1478 -> lambda$addConsequentRootSet$2
-    1:2:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1477:1478 -> lambda$addConsequentRootSet$3
-    1:1:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1488:1488 -> lambda$addDependentItems$4
-    1:2:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1488:1489 -> lambda$addDependentItems$5
-    1:23:boolean lambda$pruneDeadReferences$6(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1526:1548 -> lambda$pruneDeadReferences$6
-    1:1:void lambda$toString$8(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1740:1740 -> lambda$toString$8
-    1:1:java.util.Set lambda$verifyKeptItemsAreKept$7(com.android.tools.r8.graph.DexType):1661:1661 -> lambda$verifyKeptItemsAreKept$7
-    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1563:1563 -> mayBeMinified
-    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1567:1569 -> mayNotBeMinified
-    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1568:1572 -> mayNotBeMinified
-    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1571:1576 -> mayNotBeMinified
-    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1575:1575 -> mayNotBeMinified
-    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1554:1555 -> move
-    1:4:void prune(com.android.tools.r8.graph.DexReference):1508:1511 -> prune
-    1:3:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1515:1517 -> pruneDeadItems
-    1:1:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1524:1524 -> pruneDeadReferences
-    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1559:1559 -> shouldNotBeMinified
-    1:20:java.lang.String toString():1723:1742 -> toString
-    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1581:1584 -> verifyKeptFieldsAreAccessedAndLive
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():135:135 -> verifyKeptFieldsAreAccessedAndLive
-    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1586 -> verifyKeptFieldsAreAccessedAndLive
-    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1586:1590 -> verifyKeptFieldsAreAccessedAndLive
-    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1643:1715 -> verifyKeptItemsAreKept
-    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1598:1608 -> verifyKeptMethodsAreTargetedAndLive
-    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1617:1621 -> verifyKeptTypesAreLive
+    1:1:void <clinit>():1379:1379 -> <clinit>
+    1:1:void <init>(java.util.Map,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,com.android.tools.r8.utils.PredicateSet,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):1379:1379 -> <init>
+    2:27:void <init>(java.util.Map,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,com.android.tools.r8.utils.PredicateSet,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):1426:1451 -> <init>
+    1:13:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1471:1483 -> addConsequentRootSet
+    1:1:void addDependentItems(java.util.Map):1489:1489 -> addDependentItems
+    1:9:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1455:1463 -> checkAllRulesAreUsed
+    1:11:void copy(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1497:1507 -> copy
+    1:1:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1379:1379 -> forEachClassWithDependentItems
+    1:1:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1379:1379 -> forEachDependentInstanceConstructor
+    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1379:1379 -> forEachDependentNonStaticMember
+    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1379:1379 -> forEachDependentStaticMember
+    1:1:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1379:1379 -> forEachMemberWithDependentItems
+    1:9:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1632:1640 -> isKeptDirectlyOrIndirectly
+    1:1:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexReference):1476:1476 -> lambda$addConsequentRootSet$0
+    1:1:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexReference,java.util.Set):1476:1476 -> lambda$addConsequentRootSet$1
+    1:1:java.util.Set lambda$addConsequentRootSet$2(com.android.tools.r8.graph.DexType):1482:1482 -> lambda$addConsequentRootSet$2
+    1:2:void lambda$addConsequentRootSet$3(com.android.tools.r8.graph.DexType,java.util.Set):1481:1482 -> lambda$addConsequentRootSet$3
+    1:1:java.util.Map lambda$addDependentItems$4(com.android.tools.r8.graph.DexReference):1492:1492 -> lambda$addDependentItems$4
+    1:2:void lambda$addDependentItems$5(com.android.tools.r8.graph.DexReference,java.util.Map):1492:1493 -> lambda$addDependentItems$5
+    1:23:boolean lambda$pruneDeadReferences$6(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1530:1552 -> lambda$pruneDeadReferences$6
+    1:1:void lambda$toString$8(java.lang.StringBuilder,com.android.tools.r8.graph.DexReference):1744:1744 -> lambda$toString$8
+    1:1:java.util.Set lambda$verifyKeptItemsAreKept$7(com.android.tools.r8.graph.DexType):1665:1665 -> lambda$verifyKeptItemsAreKept$7
+    1:1:boolean mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1567:1567 -> mayBeMinified
+    1:3:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1571:1573 -> mayNotBeMinified
+    4:8:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1572:1576 -> mayNotBeMinified
+    9:14:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1575:1580 -> mayNotBeMinified
+    15:15:boolean mayNotBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1579:1579 -> mayNotBeMinified
+    1:2:void move(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):1558:1559 -> move
+    1:1:boolean noShrinking(com.android.tools.r8.graph.DexReference):1379:1379 -> noShrinking
+    1:4:void prune(com.android.tools.r8.graph.DexReference):1512:1515 -> prune
+    1:3:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1519:1521 -> pruneDeadItems
+    1:1:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1528:1528 -> pruneDeadReferences
+    1:1:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1563:1563 -> shouldNotBeMinified
+    1:20:java.lang.String toString():1727:1746 -> toString
+    1:4:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1585:1588 -> verifyKeptFieldsAreAccessedAndLive
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():139:139 -> verifyKeptFieldsAreAccessedAndLive
+    5:5:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1590 -> verifyKeptFieldsAreAccessedAndLive
+    6:10:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1590:1594 -> verifyKeptFieldsAreAccessedAndLive
+    1:73:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo):1647:1719 -> verifyKeptItemsAreKept
+    1:11:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1602:1612 -> verifyKeptMethodsAreTargetedAndLive
+    1:5:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1621:1625 -> verifyKeptTypesAreLive
 com.android.tools.r8.shaking.RootSetBuilder$RootSetBase -> com.android.tools.r8.shaking.RootSetBuilder$RootSetBase:
     1:8:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Map,java.util.Map,java.util.List):1279:1286 -> <init>
-    1:6:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1291:1296 -> forEachClassWithDependentItems
-    1:2:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1318:1319 -> forEachDependentInstanceConstructor
-    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1339:1340 -> forEachDependentNonStaticMember
-    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1355:1356 -> forEachDependentStaticMember
-    1:5:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1304:1308 -> forEachMemberWithDependentItems
-    1:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1366:1366 -> getDependentItems
-    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1371:1371 -> getDependentKeepClassCompatRule
-    1:8:void lambda$forEachDependentInstanceConstructor$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexReference,java.util.Set):1321:1328 -> lambda$forEachDependentInstanceConstructor$0
-    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):201:201 -> lambda$forEachDependentNonStaticMember$1
-    1:1:void lambda$forEachDependentNonStaticMember$1(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):1342 -> lambda$forEachDependentNonStaticMember$1
-    2:4:void lambda$forEachDependentNonStaticMember$1(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):1344:1346 -> lambda$forEachDependentNonStaticMember$1
-    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):201:201 -> lambda$forEachDependentStaticMember$2
-    1:1:void lambda$forEachDependentStaticMember$2(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):1358 -> lambda$forEachDependentStaticMember$2
-    2:3:void lambda$forEachDependentStaticMember$2(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):1359:1360 -> lambda$forEachDependentStaticMember$2
+    1:6:void forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1295:1300 -> forEachClassWithDependentItems
+    1:2:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1322:1323 -> forEachDependentInstanceConstructor
+    1:2:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1343:1344 -> forEachDependentNonStaticMember
+    1:2:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1359:1360 -> forEachDependentStaticMember
+    1:5:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1308:1312 -> forEachMemberWithDependentItems
+    1:3:java.util.Map getDependentItems(com.android.tools.r8.graph.DexDefinition):1370:1370 -> getDependentItems
+    1:1:java.util.Set getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1375:1375 -> getDependentKeepClassCompatRule
+    1:8:void lambda$forEachDependentInstanceConstructor$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexReference,java.util.Set):1325:1332 -> lambda$forEachDependentInstanceConstructor$0
+    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):231:231 -> lambda$forEachDependentNonStaticMember$1
+    1:1:void lambda$forEachDependentNonStaticMember$1(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):1346 -> lambda$forEachDependentNonStaticMember$1
+    2:4:void lambda$forEachDependentNonStaticMember$1(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):1348:1350 -> lambda$forEachDependentNonStaticMember$1
+    1:1:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):231:231 -> lambda$forEachDependentStaticMember$2
+    1:1:void lambda$forEachDependentStaticMember$2(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):1362 -> lambda$forEachDependentStaticMember$2
+    2:3:void lambda$forEachDependentStaticMember$2(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):1363:1364 -> lambda$forEachDependentStaticMember$2
+    1:1:boolean noShrinking(com.android.tools.r8.graph.DexReference):1290:1290 -> noShrinking
 com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules:
     1:1:void <clinit>():495:495 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):495:495 -> <init>
@@ -63583,7 +64578,7 @@
     1:1:void run():524:524 -> run
     1:25:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):557:581 -> tryAndKeepMethodOnClass
     1:1:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):528:528 -> visitAllSuperInterfaces
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> visitAllSuperInterfaces
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> visitAllSuperInterfaces
     2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):528 -> visitAllSuperInterfaces
     3:24:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):529:550 -> visitAllSuperInterfaces
 com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.ScopedDexMethodSet:
@@ -63618,26 +64613,33 @@
     1:1:void lambda$removeInstantiatedType$3(com.android.tools.r8.ir.desugar.LambdaDescriptor):47:47 -> lambda$removeInstantiatedType$3
     1:3:void removeInstantiatedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):31:33 -> removeInstantiatedType
 com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.shaking.StaticClassMerger:
-    1:1:void <clinit>():59:59 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):216:216 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):206:225 -> <init>
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> access$000
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> access$100
-    1:11:com.android.tools.r8.graph.GraphLense$NestedGraphLense buildGraphLense():246:256 -> buildGraphLense
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):217:217 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):207:226 -> <init>
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> access$000
+    1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):60:60 -> access$100
+    1:11:com.android.tools.r8.graph.GraphLense$NestedGraphLense buildGraphLense():247:257 -> buildGraphLense
     1:6:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):412:417 -> clearRepresentative
     7:11:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):416:420 -> clearRepresentative
     1:9:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):379:387 -> getOrCreateRepresentative
     1:1:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):324:324 -> isValidRepresentative
-    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):431:431 -> lambda$mayMergeAcrossPackageBoundaries$2
-    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):435:435 -> lambda$mayMergeAcrossPackageBoundaries$3
-    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> lambda$mayMergeAcrossPackageBoundaries$4
-    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$mayMergeAcrossPackageBoundaries$5(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):450:455 -> lambda$mayMergeAcrossPackageBoundaries$5
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():338:338 -> lambda$mayMergeAcrossPackageBoundaries$3
+    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):432 -> lambda$mayMergeAcrossPackageBoundaries$3
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():342:342 -> lambda$mayMergeAcrossPackageBoundaries$3
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):432 -> lambda$mayMergeAcrossPackageBoundaries$3
+    1:1:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():147:147 -> lambda$mayMergeAcrossPackageBoundaries$4
+    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):435 -> lambda$mayMergeAcrossPackageBoundaries$4
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():155:155 -> lambda$mayMergeAcrossPackageBoundaries$4
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):435 -> lambda$mayMergeAcrossPackageBoundaries$4
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():338:338 -> lambda$mayMergeAcrossPackageBoundaries$5
+    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$5(com.android.tools.r8.graph.DexEncodedMethod):443 -> lambda$mayMergeAcrossPackageBoundaries$5
+    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$mayMergeAcrossPackageBoundaries$6(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):450:455 -> lambda$mayMergeAcrossPackageBoundaries$6
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$8(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):536:536 -> lambda$mergeFields$8
     1:1:boolean lambda$mergeFields$9(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):540:540 -> lambda$mergeFields$9
-    1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$6(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):499:499 -> lambda$mergeMethods$6
     1:1:boolean lambda$mergeMethods$7(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):503:503 -> lambda$mergeMethods$7
     1:1:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):278:278 -> lambda$satisfiesMergeCriteria$0
-    1:6:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):294:299 -> lambda$satisfiesMergeCriteria$1
+    1:1:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):284:284 -> lambda$satisfiesMergeCriteria$1
+    1:6:boolean lambda$satisfiesMergeCriteria$2(com.android.tools.r8.graph.DexEncodedMethod):294:299 -> lambda$satisfiesMergeCriteria$2
     1:23:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):426:448 -> mayMergeAcrossPackageBoundaries
     24:40:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():0:16 -> mayMergeAcrossPackageBoundaries
     24:40:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):457 -> mayMergeAcrossPackageBoundaries
@@ -63645,7 +64647,7 @@
     9:9:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):331:331 -> merge
     10:44:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):339:373 -> merge
     1:31:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):524:554 -> mergeFields
-    1:20:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):496:515 -> mergeMethods
+    1:20:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):496:515 -> mergeMethods
     1:6:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):462:467 -> moveMembersFromSourceToTarget
     7:23:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:479 -> moveMembersFromSourceToTarget
     24:27:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):478:481 -> moveMembersFromSourceToTarget
@@ -63653,87 +64655,85 @@
     32:38:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):482:488 -> moveMembersFromSourceToTarget
     1:13:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):582:594 -> renameFieldIfNeeded
     1:14:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):562:575 -> renameMethodIfNeeded
-    1:12:com.android.tools.r8.graph.GraphLense$NestedGraphLense run():229:240 -> run
-    13:19:com.android.tools.r8.graph.GraphLense$NestedGraphLense run():236:242 -> run
-    1:58:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:319 -> satisfiesMergeCriteria
+    1:12:com.android.tools.r8.graph.GraphLense$NestedGraphLense run():230:241 -> run
+    13:19:com.android.tools.r8.graph.GraphLense$NestedGraphLense run():237:243 -> run
+    1:57:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):263:319 -> satisfiesMergeCriteria
     1:8:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):391:398 -> setRepresentative
     9:20:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):394:405 -> setRepresentative
     21:29:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):400:408 -> setRepresentative
 com.android.tools.r8.shaking.StaticClassMerger$1 -> com.android.tools.r8.shaking.StaticClassMerger$1:
-    1:1:void <clinit>():113:113 -> <clinit>
+    1:1:void <clinit>():114:114 -> <clinit>
 com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.shaking.StaticClassMerger$MergeGroup:
-    1:6:void <clinit>():61:61 -> <clinit>
-    13:16:void <clinit>():68:71 -> <clinit>
-    1:1:void <init>(java.lang.String,int):61:61 -> <init>
-    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> globalKey
-    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> globalKey
-    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> globalKey
-    1:2:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> key
-    1:9:java.lang.String toString():132:140 -> toString
-    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup valueOf(java.lang.String):61:61 -> valueOf
-    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] values():61:61 -> values
+    1:6:void <clinit>():62:62 -> <clinit>
+    13:16:void <clinit>():69:72 -> <clinit>
+    1:1:void <init>(java.lang.String,int):62:62 -> <init>
+    1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():114:122 -> globalKey
+    10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():120:120 -> globalKey
+    11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():118:118 -> globalKey
+    1:2:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):127:128 -> key
+    1:9:java.lang.String toString():133:141 -> toString
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup valueOf(java.lang.String):62:62 -> valueOf
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] values():62:62 -> values
 com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key:
-    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):77:79 -> <init>
-    1:1:java.lang.String access$400(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):73:73 -> access$400
-    1:5:boolean equals(java.lang.Object):104:108 -> equals
-    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> getMergeGroup
-    1:1:java.lang.String getPackageOrGlobal():87:87 -> getPackageOrGlobal
-    1:1:int hashCode():96:96 -> hashCode
-    1:1:boolean isGlobal():91:91 -> isGlobal
+    1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):78:80 -> <init>
+    1:1:java.lang.String access$400(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):74:74 -> access$400
+    1:5:boolean equals(java.lang.Object):105:109 -> equals
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():84:84 -> getMergeGroup
+    1:1:java.lang.String getPackageOrGlobal():88:88 -> getPackageOrGlobal
+    1:1:int hashCode():97:97 -> hashCode
+    1:1:boolean isGlobal():92:92 -> isGlobal
 com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.shaking.StaticClassMerger$Representative:
-    1:1:void <clinit>():151:151 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):162:162 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:164 -> <init>
-    1:1:boolean access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> access$200
-    1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> access$300
-    1:12:void include(com.android.tools.r8.graph.DexProgramClass):169:180 -> include
-    1:5:boolean isFull():189:193 -> isFull
+    1:1:void <clinit>():152:152 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):163:163 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):158:165 -> <init>
+    1:1:boolean access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):152:152 -> access$200
+    1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):152:152 -> access$300
+    1:12:void include(com.android.tools.r8.graph.DexProgramClass):170:181 -> include
+    1:5:boolean isFull():190:194 -> isFull
 com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.TreePruner:
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):43:43 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):46:46 -> <init>
-    3:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):39:56 -> <init>
-    1:1:void claimNestOwnership(com.android.tools.r8.graph.DexClass):210:210 -> claimNestOwnership
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> claimNestOwnership
-    2:2:void claimNestOwnership(com.android.tools.r8.graph.DexClass):210 -> claimNestOwnership
-    3:6:void claimNestOwnership(com.android.tools.r8.graph.DexClass):215:218 -> claimNestOwnership
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> claimNestOwnership
-    7:7:void claimNestOwnership(com.android.tools.r8.graph.DexClass):218 -> claimNestOwnership
-    8:14:void claimNestOwnership(com.android.tools.r8.graph.DexClass):220:226 -> claimNestOwnership
-    1:2:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):202:203 -> clearDeadNestMembers
-    1:2:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):249:250 -> firstUnreachableIndex
-    1:1:java.util.Collection getMethodsToKeepForConfigurationDebugging():357:357 -> getMethodsToKeepForConfigurationDebugging
-    1:35:java.util.List getNewProgramClasses(java.util.List):77:111 -> getNewProgramClasses
-    1:1:java.util.Set getRemovedClasses():353:353 -> getRemovedClasses
-    1:4:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):232:235 -> isAttributeReferencingPrunedItem
-    1:6:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):239:244 -> isAttributeReferencingPrunedType
-    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):196:196 -> isTypeLive
-    1:1:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):205:205 -> lambda$clearDeadNestMembers$1
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> lambda$clearDeadNestMembers$1
-    2:2:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):205 -> lambda$clearDeadNestMembers$1
-    3:3:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):206:206 -> lambda$clearDeadNestMembers$1
-    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):54:54 -> lambda$new$0
-    1:1:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):322:322 -> lambda$reachableFields$3
-    1:1:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):261:261 -> lambda$reachableMethods$2
-    1:23:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):156:178 -> pruneMembersAndAttributes
-    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):320:349 -> reachableFields
-    1:22:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):258:279 -> reachableMethods
-    23:41:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):276:294 -> reachableMethods
-    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():333:333 -> reachableMethods
-    42:42:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):295 -> reachableMethods
-    43:54:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):295:306 -> reachableMethods
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():401:401 -> reachableMethods
-    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):779 -> reachableMethods
-    55:55:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):306 -> reachableMethods
-    56:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):780:781 -> reachableMethods
-    56:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):306 -> reachableMethods
-    58:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305:316 -> reachableMethods
-    1:2:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):72:73 -> removeUnused
-    1:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):143:150 -> retainReachableInterfacesFrom
-    1:9:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):182:190 -> rewriteNestAttributes
-    1:7:com.android.tools.r8.graph.DirectMappedDexApplication run(com.android.tools.r8.graph.DirectMappedDexApplication):60:66 -> run
-    1:3:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):361:363 -> verifyNoDeadFields
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):47:47 -> <init>
+    3:20:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):40:57 -> <init>
+    1:1:void claimNestOwnership(com.android.tools.r8.graph.DexClass):216:216 -> claimNestOwnership
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> claimNestOwnership
+    2:2:void claimNestOwnership(com.android.tools.r8.graph.DexClass):216 -> claimNestOwnership
+    3:6:void claimNestOwnership(com.android.tools.r8.graph.DexClass):221:224 -> claimNestOwnership
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> claimNestOwnership
+    7:7:void claimNestOwnership(com.android.tools.r8.graph.DexClass):224 -> claimNestOwnership
+    8:14:void claimNestOwnership(com.android.tools.r8.graph.DexClass):226:232 -> claimNestOwnership
+    1:2:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):208:209 -> clearDeadNestMembers
+    1:2:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):255:256 -> firstUnreachableIndex
+    1:1:java.util.Collection getMethodsToKeepForConfigurationDebugging():367:367 -> getMethodsToKeepForConfigurationDebugging
+    1:39:java.util.List getNewProgramClasses(java.util.List):78:116 -> getNewProgramClasses
+    1:1:java.util.Set getRemovedClasses():363:363 -> getRemovedClasses
+    1:4:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):238:241 -> isAttributeReferencingPrunedItem
+    1:6:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):245:250 -> isAttributeReferencingPrunedType
+    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):202:202 -> isTypeLive
+    1:1:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):211:211 -> lambda$clearDeadNestMembers$1
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> lambda$clearDeadNestMembers$1
+    2:2:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):211 -> lambda$clearDeadNestMembers$1
+    3:3:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):212:212 -> lambda$clearDeadNestMembers$1
+    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):55:55 -> lambda$new$0
+    1:1:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):332:332 -> lambda$reachableFields$3
+    1:1:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):271:271 -> lambda$reachableMethods$2
+    1:23:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):162:184 -> pruneMembersAndAttributes
+    1:20:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):125:144 -> pruneUnusedInterfaces
+    1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):330:359 -> reachableFields
+    1:6:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):16:21 -> reachableMethods
+    1:6:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):264 -> reachableMethods
+    7:7:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):264:264 -> reachableMethods
+    8:29:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):268:289 -> reachableMethods
+    30:48:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286:304 -> reachableMethods
+    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():330:330 -> reachableMethods
+    49:49:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305 -> reachableMethods
+    50:61:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):305:316 -> reachableMethods
+    62:73:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:326 -> reachableMethods
+    1:2:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):73:74 -> removeUnused
+    1:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):149:156 -> retainReachableInterfacesFrom
+    1:9:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):188:196 -> rewriteNestAttributes
+    1:8:com.android.tools.r8.graph.DirectMappedDexApplication run(com.android.tools.r8.graph.DirectMappedDexApplication):61:68 -> run
+    1:3:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):371:373 -> verifyNoDeadFields
 com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.UnusedArgumentRule:
     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.UnusedArgumentRule$1):10:10 -> <init>
     2:2: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):57:57 -> <init>
@@ -63758,275 +64758,277 @@
 com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter:
     1:1:void <init>():96:96 -> <init>
 com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.VerticalClassMerger:
-    1:1:void <clinit>():95:95 -> <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):227:227 -> <init>
-    2:42: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):200:240 -> <init>
-    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$000
-    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$100
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1000
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1100
-    1:1:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> access$1200
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1300
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1400
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1500
-    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1600
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1700
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1800
-    1:1:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$1900
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$200
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$300
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):95:95 -> access$900
-    1:9:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1659:1667 -> disallowInlining
-    10:22:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1664:1676 -> disallowInlining
-    23:31:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1675:1683 -> disallowInlining
-    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):305:322 -> extractPinnedItems
-    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):864:881 -> fieldResolutionMayChange
-    1:4:java.util.Collection getInvokes():533:536 -> getInvokes
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():244:244 -> getMergedClasses
-    1:1:java.util.Collection getRemovedClasses():1987:1987 -> getRemovedClasses
-    1:6:void initializeMergeCandidates(java.lang.Iterable):248:253 -> initializeMergeCandidates
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> initializeMergeCandidates
-    7:7:void initializeMergeCandidates(java.lang.Iterable):253 -> initializeMergeCandidates
-    8:21:void initializeMergeCandidates(java.lang.Iterable):253:266 -> initializeMergeCandidates
-    1:26:void initializePinnedTypes(java.lang.Iterable):275:300 -> initializePinnedTypes
-    1:12:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):346:357 -> isMergeCandidate
+    1:1:void <clinit>():96:96 -> <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):228:228 -> <init>
+    2:42: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):201:241 -> <init>
+    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$000
+    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$100
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1000
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1100
+    1:1:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):96:96 -> access$1200
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1300
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1400
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1500
+    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1600
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1700
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1800
+    1:1:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$1900
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$200
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$300
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> access$900
+    1:9:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1672:1680 -> disallowInlining
+    10:22:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1677:1689 -> disallowInlining
+    23:31:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1688:1696 -> disallowInlining
+    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):306:323 -> extractPinnedItems
+    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):865:882 -> fieldResolutionMayChange
+    1:4:java.util.Collection getInvokes():534:537 -> getInvokes
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():245:245 -> getMergedClasses
+    1:1:java.util.Collection getRemovedClasses():2000:2000 -> getRemovedClasses
+    1:6:void initializeMergeCandidates(java.lang.Iterable):249:254 -> initializeMergeCandidates
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> initializeMergeCandidates
+    7:7:void initializeMergeCandidates(java.lang.Iterable):254 -> initializeMergeCandidates
+    8:21:void initializeMergeCandidates(java.lang.Iterable):254:267 -> initializeMergeCandidates
+    1:26:void initializePinnedTypes(java.lang.Iterable):276:301 -> initializePinnedTypes
+    1:12:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):347:358 -> isMergeCandidate
     13:13:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> isMergeCandidate
-    13:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):357 -> isMergeCandidate
-    14:17:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):357:357 -> isMergeCandidate
-    21:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):361:409 -> isMergeCandidate
-    70:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:401 -> isMergeCandidate
-    1:16:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):420:435 -> isStillMergeCandidate
-    17:56:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):434:473 -> isStillMergeCandidate
-    57:58:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):458:459 -> isStillMergeCandidate
-    59:60:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):439:440 -> isStillMergeCandidate
-    1:9:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):385:393 -> lambda$isMergeCandidate$0
-    1:1:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):435:435 -> lambda$isStillMergeCandidate$1
-    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):522:527 -> lambda$mergeMayLeadToIllegalAccesses$2
-    1:7:void lambda$methodResolutionMayChange$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):765:771 -> lambda$methodResolutionMayChange$3
-    1:1:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.LookupLambdaTarget):776:776 -> lambda$methodResolutionMayChange$4
-    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1445:1448 -> makePrivate
-    1:10:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):329:338 -> markTypeAsPinned
-    1:6:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):788:793 -> mergeClassIfPossible
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> mergeClassIfPossible
-    7:7:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):793 -> mergeClassIfPossible
-    8:67:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):793:852 -> mergeClassIfPossible
-    68:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):848:858 -> mergeClassIfPossible
-    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):854:854 -> mergeClassIfPossible
-    80:80:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):839:839 -> mergeClassIfPossible
-    1:1:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):481:481 -> mergeMayLeadToIllegalAccesses
-    2:2:boolean com.android.tools.r8.graph.DexClass.isPrivate():515:515 -> mergeMayLeadToIllegalAccesses
-    2:2:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):485 -> mergeMayLeadToIllegalAccesses
-    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> mergeMayLeadToIllegalAccesses
-    3:3:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):485 -> mergeMayLeadToIllegalAccesses
-    4:4:boolean com.android.tools.r8.graph.DexClass.isPrivate():515:515 -> mergeMayLeadToIllegalAccesses
-    4:4:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):486 -> mergeMayLeadToIllegalAccesses
-    5:5:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> mergeMayLeadToIllegalAccesses
-    5:5:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):486 -> mergeMayLeadToIllegalAccesses
-    6:6:boolean com.android.tools.r8.graph.DexClass.isPublic():519:519 -> mergeMayLeadToIllegalAccesses
-    6:6:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):495 -> mergeMayLeadToIllegalAccesses
-    7:7:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):498:498 -> mergeMayLeadToIllegalAccesses
-    8:8:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():151:151 -> mergeMayLeadToIllegalAccesses
-    8:8:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):499 -> mergeMayLeadToIllegalAccesses
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():143:143 -> mergeMayLeadToIllegalAccesses
-    9:9:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):499 -> mergeMayLeadToIllegalAccesses
-    10:10:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503:503 -> mergeMayLeadToIllegalAccesses
-    11:11:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():345:345 -> mergeMayLeadToIllegalAccesses
-    11:11:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> mergeMayLeadToIllegalAccesses
-    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():341:341 -> mergeMayLeadToIllegalAccesses
-    12:12:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> mergeMayLeadToIllegalAccesses
-    13:13:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():345:345 -> mergeMayLeadToIllegalAccesses
-    13:13:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):508 -> mergeMayLeadToIllegalAccesses
-    14:14:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509:509 -> mergeMayLeadToIllegalAccesses
-    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():345:345 -> mergeMayLeadToIllegalAccesses
-    15:15:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):510 -> mergeMayLeadToIllegalAccesses
-    16:27:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):518:529 -> mergeMayLeadToIllegalAccesses
-    1:62:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):717:778 -> methodResolutionMayChange
-    1:12:com.android.tools.r8.shaking.VerticalClassMergerGraphLense run():632:643 -> run
-    1:6:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLense):648:648 -> verifyGraphLens
-    12:68:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLense):654:710 -> verifyGraphLens
+    13:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):358 -> isMergeCandidate
+    14:17:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):358:358 -> isMergeCandidate
+    21:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):362:410 -> isMergeCandidate
+    70:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):401:402 -> isMergeCandidate
+    1:16:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):421:436 -> isStillMergeCandidate
+    17:56:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):435:474 -> isStillMergeCandidate
+    57:58:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):459:460 -> isStillMergeCandidate
+    59:60:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):440:441 -> isStillMergeCandidate
+    1:9:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):386:394 -> lambda$isMergeCandidate$0
+    1:1:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):436:436 -> lambda$isStillMergeCandidate$1
+    1:6:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):523:528 -> lambda$mergeMayLeadToIllegalAccesses$2
+    1:7:void lambda$methodResolutionMayChange$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):766:772 -> lambda$methodResolutionMayChange$3
+    1:1:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.LookupLambdaTarget):777:777 -> lambda$methodResolutionMayChange$4
+    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1449:1452 -> makePrivate
+    1:10:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):330:339 -> markTypeAsPinned
+    1:6:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):789:794 -> mergeClassIfPossible
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> mergeClassIfPossible
+    7:7:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):794 -> mergeClassIfPossible
+    8:67:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):794:853 -> mergeClassIfPossible
+    68:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):849:859 -> mergeClassIfPossible
+    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):855:855 -> mergeClassIfPossible
+    80:80:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:840 -> mergeClassIfPossible
+    1:1:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):482:482 -> mergeMayLeadToIllegalAccesses
+    2:2:boolean com.android.tools.r8.graph.DexClass.isPrivate():520:520 -> mergeMayLeadToIllegalAccesses
+    2:2:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):486 -> mergeMayLeadToIllegalAccesses
+    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> mergeMayLeadToIllegalAccesses
+    3:3:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):486 -> mergeMayLeadToIllegalAccesses
+    4:4:boolean com.android.tools.r8.graph.DexClass.isPrivate():520:520 -> mergeMayLeadToIllegalAccesses
+    4:4:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):487 -> mergeMayLeadToIllegalAccesses
+    5:5:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> mergeMayLeadToIllegalAccesses
+    5:5:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):487 -> mergeMayLeadToIllegalAccesses
+    6:6:boolean com.android.tools.r8.graph.DexClass.isPublic():524:524 -> mergeMayLeadToIllegalAccesses
+    6:6:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496 -> mergeMayLeadToIllegalAccesses
+    7:7:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):499:499 -> mergeMayLeadToIllegalAccesses
+    8:8:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():155:155 -> mergeMayLeadToIllegalAccesses
+    8:8:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):500 -> mergeMayLeadToIllegalAccesses
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():147:147 -> mergeMayLeadToIllegalAccesses
+    9:9:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):500 -> mergeMayLeadToIllegalAccesses
+    10:10:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504:504 -> mergeMayLeadToIllegalAccesses
+    11:11:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():342:342 -> mergeMayLeadToIllegalAccesses
+    11:11:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> mergeMayLeadToIllegalAccesses
+    12:12:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():338:338 -> mergeMayLeadToIllegalAccesses
+    12:12:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> mergeMayLeadToIllegalAccesses
+    13:13:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():342:342 -> mergeMayLeadToIllegalAccesses
+    13:13:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509 -> mergeMayLeadToIllegalAccesses
+    14:14:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):510:510 -> mergeMayLeadToIllegalAccesses
+    15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():342:342 -> mergeMayLeadToIllegalAccesses
+    15:15:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511 -> mergeMayLeadToIllegalAccesses
+    16:27:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):519:530 -> mergeMayLeadToIllegalAccesses
+    1:62:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):718:779 -> methodResolutionMayChange
+    1:12:com.android.tools.r8.shaking.VerticalClassMergerGraphLense run():633:644 -> run
+    1:6:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLense):649:649 -> verifyGraphLens
+    12:68:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLense):655:711 -> verifyGraphLens
 com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.VerticalClassMerger$1:
-    1:1:void <clinit>():1970:1970 -> <clinit>
-    2:2:void <clinit>():1385:1385 -> <clinit>
-    3:3:void <clinit>():123:123 -> <clinit>
+    1:1:void <clinit>():1983:1983 -> <clinit>
+    2:2:void <clinit>():1389:1389 -> <clinit>
+    3:3:void <clinit>():124:124 -> <clinit>
 com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.VerticalClassMerger$AbortReason:
-    1:20:void <clinit>():97:97 -> <clinit>
-    1:1:void <init>(java.lang.String,int):97:97 -> <init>
-    1:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):123:181 -> getMessageForClass
-    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):179:179 -> getMessageForClass
-    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):118:118 -> printLogMessageForClass
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):97:97 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():97:97 -> values
+    1:20:void <clinit>():98:98 -> <clinit>
+    1:1:void <init>(java.lang.String,int):98:98 -> <init>
+    1:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):124:182 -> getMessageForClass
+    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> getMessageForClass
+    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):119:119 -> printLogMessageForClass
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):98:98 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():98:98 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger:
-    1:1:void <clinit>():892:892 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):892:892 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):904:904 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):898:906 -> <init>
-    1:1:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1293:1293 -> add
-    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1298:1299 -> addAll
-    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1218:1218 -> blockRedirectionOfSuperCalls
-    1:35:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1223:1257 -> buildBridgeMethod
-    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1264:1284 -> findMethodInTarget
-    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1279:1279 -> findMethodInTarget
-    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1336:1340 -> getFreshName
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1131:1131 -> getRenamings
-    1:1:java.util.List getSynthesizedBridges():1135:1135 -> getSynthesizedBridges
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):921:924 -> lambda$merge$0
-    1:3:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1001:1003 -> lambda$merge$1
-    4:4:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1002:1002 -> lambda$merge$1
-    1:1:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1064:1064 -> lambda$merge$2
-    1:1:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1108:1108 -> lambda$merge$3
-    1:2:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1116:1117 -> lambda$restoreDebuggingState$4
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1121:1122 -> lambda$restoreDebuggingState$5
-    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1126:1126 -> lambda$restoreDebuggingState$6
-    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1435:1439 -> makeStatic
-    1:26:boolean merge():913:938 -> merge
-    27:56:boolean merge():935:964 -> merge
-    57:101:boolean merge():963:1007 -> merge
-    102:149:boolean merge():998:1045 -> merge
-    150:175:boolean merge():1044:1069 -> merge
-    176:185:boolean merge():1067:1076 -> merge
-    186:221:boolean merge():1074:1109 -> merge
-    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1304:1306 -> mergeArrays
-    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1315:1327 -> mergeFields
-    1:57:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1139:1195 -> redirectSuperCallsInTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1345:1364 -> renameConstructor
-    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1416:1431 -> 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):1370:1370 -> 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):1380:1408 -> 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):1387:1411 -> renameMethod
-    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1114:1126 -> restoreDebuggingState
-    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1125:1125 -> restoreDebuggingState
+    1:1:void <clinit>():893:893 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):893:893 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):905:905 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):899:907 -> <init>
+    1:1:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1297:1297 -> add
+    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1302:1303 -> addAll
+    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1221:1221 -> blockRedirectionOfSuperCalls
+    1:36:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1226:1261 -> buildBridgeMethod
+    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1268:1288 -> findMethodInTarget
+    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1283:1283 -> findMethodInTarget
+    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1340:1344 -> getFreshName
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1134:1134 -> getRenamings
+    1:1:java.util.List getSynthesizedBridges():1138:1138 -> getSynthesizedBridges
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):922:925 -> lambda$merge$0
+    1:3:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1004:1006 -> lambda$merge$1
+    4:4:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1005:1005 -> lambda$merge$1
+    1:1:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1067:1067 -> lambda$merge$2
+    1:1:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1111:1111 -> lambda$merge$3
+    1:2:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1119:1120 -> lambda$restoreDebuggingState$4
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1124:1125 -> lambda$restoreDebuggingState$5
+    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1129:1129 -> lambda$restoreDebuggingState$6
+    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1439:1443 -> makeStatic
+    1:26:boolean merge():914:939 -> merge
+    27:56:boolean merge():936:965 -> merge
+    57:76:boolean merge():964:983 -> merge
+    77:105:boolean merge():982:1010 -> merge
+    106:153:boolean merge():1001:1048 -> merge
+    154:179:boolean merge():1047:1072 -> merge
+    180:189:boolean merge():1070:1079 -> merge
+    190:225:boolean merge():1077:1112 -> merge
+    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1308:1310 -> mergeArrays
+    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1319:1331 -> mergeFields
+    1:57:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1142:1198 -> redirectSuperCallsInTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1349:1368 -> renameConstructor
+    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1420:1435 -> 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):1374:1374 -> 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):1384:1412 -> 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):1391:1415 -> renameMethod
+    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1117:1129 -> restoreDebuggingState
+    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1128:1128 -> restoreDebuggingState
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector:
-    1:1:void <clinit>():1548:1548 -> <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):1548:1548 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1559:1559 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1553:1565 -> <init>
-    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):1622:1653 -> computePositionsFor
-    1:18:void fillSeenPositions():1595:1612 -> fillSeenPositions
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1602:1603 -> lambda$fillSeenPositions$0
-    1:22:boolean mayCollide():1569:1590 -> mayCollide
+    1:1:void <clinit>():1561:1561 -> <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):1561:1561 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1572:1572 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1566:1578 -> <init>
+    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):1635:1666 -> computePositionsFor
+    1:18:void fillSeenPositions():1608:1625 -> fillSeenPositions
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1615:1616 -> lambda$fillSeenPositions$0
+    1:22:boolean mayCollide():1582:1603 -> mayCollide
 com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector:
-    1:1:void <clinit>():1768:1768 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1777:1779 -> <init>
-    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1791:1798 -> checkFieldReference
-    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):206:206 -> checkFieldReference
-    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1798 -> checkFieldReference
-    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1799:1800 -> checkFieldReference
-    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1808:1817 -> checkMethodReference
-    11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):211:211 -> checkMethodReference
-    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1817 -> checkMethodReference
-    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1818:1819 -> checkMethodReference
-    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1827:1831 -> checkTypeReference
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> checkTypeReference
-    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1831 -> checkTypeReference
-    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1832:1833 -> checkTypeReference
-    1:1:boolean foundIllegalAccess():1783:1783 -> foundIllegalAccess
-    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):1842:1842 -> registerInitClass
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1892:1892 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1887:1887 -> registerInstanceFieldWrite
-    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1855:1858 -> registerInvokeDirect
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1871:1874 -> registerInvokeInterface
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1863:1866 -> registerInvokeStatic
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1879:1882 -> registerInvokeSuper
-    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1847:1850 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1897:1897 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1902:1902 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1907:1907 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1912:1912 -> registerTypeReference
-    1:1:void setContext(com.android.tools.r8.graph.ProgramMethod):1787:1787 -> setContext
+    1:1:void <clinit>():1781:1781 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1790:1792 -> <init>
+    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1804:1811 -> checkFieldReference
+    9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):236:236 -> checkFieldReference
+    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1811 -> checkFieldReference
+    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1812:1813 -> checkFieldReference
+    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1821:1830 -> checkMethodReference
+    11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):241:241 -> checkMethodReference
+    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1830 -> checkMethodReference
+    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1831:1832 -> checkMethodReference
+    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1840:1844 -> checkTypeReference
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> checkTypeReference
+    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1844 -> checkTypeReference
+    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1845:1846 -> checkTypeReference
+    1:1:boolean foundIllegalAccess():1796:1796 -> foundIllegalAccess
+    1:1:boolean registerInitClass(com.android.tools.r8.graph.DexType):1855:1855 -> registerInitClass
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1905:1905 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1900:1900 -> registerInstanceFieldWrite
+    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1868:1871 -> registerInvokeDirect
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1884:1887 -> registerInvokeInterface
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1876:1879 -> registerInvokeStatic
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1892:1895 -> registerInvokeSuper
+    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1860:1863 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1910:1910 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1915:1915 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1920:1920 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1925:1925 -> registerTypeReference
+    1:1:void setContext(com.android.tools.r8.graph.ProgramMethod):1800:1800 -> 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):547:547 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):542:550 -> <init>
-    1:35:java.util.Collection get():555:589 -> get
-    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):573:573 -> lambda$get$0
-    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):597:611 -> protoMayReferenceMergedSourceOrTarget
-    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):617:624 -> typeMayReferenceMergedSourceOrTarget
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):548:548 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):543:551 -> <init>
+    1:35:java.util.Collection get():556:590 -> get
+    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):574:574 -> lambda$get$0
+    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):598:612 -> protoMayReferenceMergedSourceOrTarget
+    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):618:625 -> typeMayReferenceMergedSourceOrTarget
 com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.VerticalClassMerger$Rename:
-    1:3:void <clinit>():186:188 -> <clinit>
-    4:4:void <clinit>():185:185 -> <clinit>
-    1:1:void <init>(java.lang.String,int):185:185 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):185:185 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():185:185 -> values
+    1:3:void <clinit>():187:189 -> <clinit>
+    4:4:void <clinit>():186:186 -> <clinit>
+    1:1:void <init>(java.lang.String,int):186:186 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):186:186 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():186:186 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense:
-    1:1:void <clinit>():1686:1686 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1691:1693 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1703:1703 -> getOriginalFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1708:1708 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1698:1698 -> getOriginalType
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1713:1713 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1718:1718 -> getRenamedMethodSignature
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1757:1757 -> 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):1730:1747 -> lookupMethod
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1752:1752 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1723:1723 -> lookupType
+    1:1:void <clinit>():1699:1699 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1704:1706 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1716:1716 -> getOriginalFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1721:1721 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1711:1711 -> getOriginalType
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1726:1726 -> getRenamedFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense):1731:1731 -> getRenamedMethodSignature
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1770:1770 -> 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):1743:1760 -> lookupMethod
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1765:1765 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1736:1736 -> 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):1929:1934 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1916:1916 -> access$600
-    1:1:java.util.function.Consumer getRegistryCallback():1969:1969 -> getRegistryCallback
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1955:1955 -> getSourceCodeProvider
+    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):1942:1947 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1929:1929 -> access$600
+    1:1:java.util.function.Consumer getRegistryCallback():1982:1982 -> getRegistryCallback
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1968:1968 -> getSourceCodeProvider
     2:26:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> getSourceCodeProvider
-    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1956 -> getSourceCodeProvider
-    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1957:1964 -> getSourceCodeProvider
-    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1970:1980 -> lambda$getRegistryCallback$0
-    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1972:1972 -> lambda$getRegistryCallback$0
-    1:2:void updateMethodSignatures(java.util.function.Function):1949:1950 -> updateMethodSignatures
+    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1969 -> getSourceCodeProvider
+    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1970:1977 -> getSourceCodeProvider
+    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1983:1993 -> lambda$getRegistryCallback$0
+    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1985:1985 -> lambda$getRegistryCallback$0
+    1:2:void updateMethodSignatures(java.util.function.Function):1962:1963 -> 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):1451:1455 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1454:1456 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1451:1451 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1451:1451 -> access$500
-    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1491:1501 -> fixupFields
-    1:7:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1476:1482 -> fixupMethod
-    8:10:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1507:1507 -> fixupMethod
-    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1512:1517 -> fixupProto
-    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1523:1533 -> fixupType
-    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLense fixupTypeReferences():1460:1470 -> fixupTypeReferences
-    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1540:1542 -> fixupTypes
+    1:1:void <clinit>():1455:1455 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1455:1459 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1458:1460 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1455:1455 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1455:1455 -> access$500
+    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1504:1514 -> fixupFields
+    1:14:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1480:1493 -> fixupMethod
+    15:17:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1520:1520 -> fixupMethod
+    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1525:1530 -> fixupProto
+    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1536:1546 -> fixupType
+    1:11:com.android.tools.r8.shaking.VerticalClassMergerGraphLense fixupTypeReferences():1464:1474 -> fixupTypeReferences
+    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1553:1555 -> fixupTypes
 com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.VerticalClassMergerGraphLense:
-    1:1:void <clinit>():48:48 -> <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):48:48 -> <init>
-    2:2: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):77:77 -> <init>
-    3:14: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):70:81 -> <init>
-    1:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):109:109 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):104:104 -> getOriginalType
-    1:3:void initializeCacheForLookupMethodInAllContexts():85:87 -> initializeCacheForLookupMethodInAllContexts
-    1:1:boolean isContextFreeForMethods():164:164 -> isContextFreeForMethods
-    1:1:java.util.Set lambda$initializeCacheForLookupMethodInAllContexts$0(com.android.tools.r8.graph.DexMethod):91:91 -> lambda$initializeCacheForLookupMethodInAllContexts$0
-    1:4:void lambda$initializeCacheForLookupMethodInAllContexts$1(com.android.tools.r8.graph.DexType,java.util.Map):89:92 -> lambda$initializeCacheForLookupMethodInAllContexts$1
-    1:1:boolean lambda$verifyIsContextFreeForMethod$2(com.android.tools.r8.graph.DexMethod,java.util.Map):172:172 -> lambda$verifyIsContextFreeForMethod$2
-    1:24: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:138 -> lookupMethod
-    1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):148:159 -> lookupMethodInAllContexts
-    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):143:143 -> mapInvocationType
-    1:2:void unsetCacheForLookupMethodInAllContexts():98:99 -> unsetCacheForLookupMethodInAllContexts
-    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):169:172 -> verifyIsContextFreeForMethod
-    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):171:171 -> verifyIsContextFreeForMethod
+    1:1:void <clinit>():49:49 -> <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):49:49 -> <init>
+    2:2: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):78:78 -> <init>
+    3:14: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):71:82 -> <init>
+    1:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):110:110 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):105:105 -> getOriginalType
+    1:3:void initializeCacheForLookupMethodInAllContexts():86:88 -> initializeCacheForLookupMethodInAllContexts
+    1:1:boolean isContextFreeForMethods():165:165 -> isContextFreeForMethods
+    1:1:java.util.Set lambda$initializeCacheForLookupMethodInAllContexts$0(com.android.tools.r8.graph.DexMethod):92:92 -> lambda$initializeCacheForLookupMethodInAllContexts$0
+    1:4:void lambda$initializeCacheForLookupMethodInAllContexts$1(com.android.tools.r8.graph.DexType,java.util.Map):90:93 -> lambda$initializeCacheForLookupMethodInAllContexts$1
+    1:1:boolean lambda$verifyIsContextFreeForMethod$2(com.android.tools.r8.graph.DexMethod,java.util.Map):173:173 -> lambda$verifyIsContextFreeForMethod$2
+    1:24: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):116:139 -> lookupMethod
+    1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):149:160 -> lookupMethodInAllContexts
+    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):144:144 -> mapInvocationType
+    1:2:void unsetCacheForLookupMethodInAllContexts():99:100 -> unsetCacheForLookupMethodInAllContexts
+    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):170:173 -> verifyIsContextFreeForMethod
+    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):172:172 -> verifyIsContextFreeForMethod
 com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder:
-    1:1:void <clinit>():176:176 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):192:192 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DexItemFactory):180:193 -> <init>
-    1:16:com.android.tools.r8.shaking.VerticalClassMergerGraphLense build(com.android.tools.r8.graph.AppView,java.util.Map):242:257 -> build
-    1:5:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):197:201 -> createBuilderForFixup
-    6:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):199:206 -> createBuilderForFixup
-    14:20:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):204:210 -> createBuilderForFixup
-    21:35:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):209:223 -> createBuilderForFixup
-    36:43:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):222:229 -> createBuilderForFixup
-    44:52:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):227:235 -> createBuilderForFixup
-    53:53:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):233:233 -> createBuilderForFixup
-    1:12:com.android.tools.r8.graph.DexField getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,java.util.Map):262:273 -> getFieldSignatureAfterClassMerging
-    1:14:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,java.util.Map):278:291 -> getMethodSignatureAfterClassMerging
-    1:9:com.android.tools.r8.graph.DexType getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,java.util.Map):295:303 -> getTypeAfterClassMerging
-    1:4:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):307:310 -> hasMappingForSignatureInContext
-    1:1:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):316:316 -> hasOriginalSignatureMappingFor
-    2:3:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):320:321 -> hasOriginalSignatureMappingFor
-    1:1:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$0(java.util.Map,com.android.tools.r8.graph.DexType):286:286 -> lambda$getMethodSignatureAfterClassMerging$0
-    1:1:java.util.Map lambda$mapVirtualMethodToDirectInType$1(com.android.tools.r8.graph.DexType):348:348 -> lambda$mapVirtualMethodToDirectInType$1
-    1:1:void map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):329:329 -> map
-    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):333:333 -> map
-    1:3:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult,com.android.tools.r8.graph.DexType):347:349 -> mapVirtualMethodToDirectInType
-    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):325:325 -> markMethodAsMerged
-    1:14:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):353:366 -> merge
-    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):342:342 -> recordCreationOfBridgeMethod
-    1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):338:338 -> recordMove
+    1:1:void <clinit>():177:177 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):193:193 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexItemFactory):181:194 -> <init>
+    1:16:com.android.tools.r8.shaking.VerticalClassMergerGraphLense build(com.android.tools.r8.graph.AppView,java.util.Map):243:258 -> build
+    1:5:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):198:202 -> createBuilderForFixup
+    6:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):200:207 -> createBuilderForFixup
+    14:20:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):205:211 -> createBuilderForFixup
+    21:35:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):210:224 -> createBuilderForFixup
+    36:43:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):223:230 -> createBuilderForFixup
+    44:52:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):228:236 -> createBuilderForFixup
+    53:53:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder,java.util.Map):234:234 -> createBuilderForFixup
+    1:12:com.android.tools.r8.graph.DexField getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,java.util.Map):263:274 -> getFieldSignatureAfterClassMerging
+    1:14:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,java.util.Map):279:292 -> getMethodSignatureAfterClassMerging
+    1:9:com.android.tools.r8.graph.DexType getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,java.util.Map):296:304 -> getTypeAfterClassMerging
+    1:4:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):308:311 -> hasMappingForSignatureInContext
+    1:1:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):317:317 -> hasOriginalSignatureMappingFor
+    2:3:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):321:322 -> hasOriginalSignatureMappingFor
+    1:1:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$0(java.util.Map,com.android.tools.r8.graph.DexType):287:287 -> lambda$getMethodSignatureAfterClassMerging$0
+    1:1:java.util.Map lambda$mapVirtualMethodToDirectInType$1(com.android.tools.r8.graph.DexType):349:349 -> lambda$mapVirtualMethodToDirectInType$1
+    1:1:void map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):330:330 -> map
+    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):334:334 -> map
+    1:3:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult,com.android.tools.r8.graph.DexType):348:350 -> mapVirtualMethodToDirectInType
+    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):326:326 -> markMethodAsMerged
+    1:14:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):354:367 -> merge
+    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):343:343 -> recordCreationOfBridgeMethod
+    1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):339:339 -> recordMove
 com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.shaking.WhyAreYouKeepingConsumer:
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -64086,11 +65088,16 @@
     31:36:java.util.List readArchive():76:81 -> a
     37:50:java.util.List readArchive():73:86 -> a
     51:66:java.util.List readArchive():69:84 -> a
-    67:67:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):83:83 -> a
     1:3:java.util.Collection getProgramResources():92:94 -> getProgramResources
 com.android.tools.r8.utils.AbortException -> com.android.tools.r8.utils.b:
-    1:1:void <init>():12:12 -> <init>
-    2:2:void <init>(java.lang.String):17:17 -> <init>
+    com.android.tools.r8.Diagnostic diagnostic -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.Diagnostic):20:22 -> <init>
+    1:1:com.android.tools.r8.origin.Origin getOrigin():39:39 -> a
+    1:1:com.android.tools.r8.position.Position getPosition():43:43 -> b
+    1:2:java.lang.Throwable getCause():28:29 -> getCause
+    1:1:java.lang.String getMessage():35:35 -> getMessage
 com.android.tools.r8.utils.Action -> com.android.tools.r8.utils.c:
     void execute() -> a
 com.android.tools.r8.utils.AndroidApiLevel -> com.android.tools.r8.utils.d:
@@ -64131,7 +65138,8 @@
     31:63:void <clinit>():14:46 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):52:53 -> <init>
     1:2:java.util.List getAndroidApiLevelsSorted():73:74 -> a
-    3:3:boolean isGreaterThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):174:174 -> a
+    3:3:boolean isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):166:166 -> a
+    3:3:boolean isGreaterThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):174 -> a
     1:1:com.android.tools.r8.utils.AndroidApiLevel getDefault():65:65 -> b
     2:2:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):157:157 -> b
     3:3:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):155:155 -> b
@@ -64166,7 +65174,6 @@
     32:32:com.android.tools.r8.utils.AndroidApiLevel getAndroidApiLevel(int):97:97 -> b
     33:33:boolean isLessThan(com.android.tools.r8.utils.AndroidApiLevel):162:162 -> b
     1:1:com.android.tools.r8.utils.DexVersion getDexVersion():69:69 -> c
-    2:2:boolean isLessThanOrEqualTo(com.android.tools.r8.utils.AndroidApiLevel):166:166 -> c
     1:1:int getLevel():57:57 -> d
     1:1:com.android.tools.r8.utils.AndroidApiLevel[] values():14:14 -> e
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.e:
@@ -64179,101 +65186,113 @@
     com.android.tools.r8.com.google.common.collect.ImmutableList programResourceProviders -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryResourceProviders -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathResourceProviders -> c
-    1:1:void <clinit>():75:75 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,java.util.List,java.util.List,com.android.tools.r8.utils.AndroidApp$1):75:75 -> <init>
-    2:12:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,java.util.List,java.util.List):162:172 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):75:75 -> a
-    2:5:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):135:138 -> a
-    6:12:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):144:150 -> a
-    13:14:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):178:179 -> a
-    15:15:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):180:180 -> a
-    16:16:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):196:196 -> a
-    17:17:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):208:208 -> a
-    18:20:int applicationSize():213:213 -> a
-    22:30:int applicationSize():215:215 -> a
-    37:37:int applicationSize():222:222 -> a
-    38:38:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):222:222 -> a
-    39:43:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):308:312 -> a
-    44:47:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):374:377 -> a
-    48:49:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):421:422 -> a
-    50:54:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):427:431 -> a
-    55:61:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):430:436 -> a
-    62:63:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):453:454 -> a
-    62:63:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):437 -> a
-    64:65:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):446:447 -> a
-    64:65:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):438 -> a
-    66:66:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):439:439 -> a
-    67:78:void dump(java.nio.file.Path,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):429:440 -> a
-    79:81:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):485:487 -> a
-    82:82:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    82:82:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):487 -> a
-    83:89:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):488:494 -> a
-    90:103:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):491:504 -> a
-    104:120:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):486:502 -> a
-    121:140:int dumpProgramResources(java.lang.String,int,java.util.zip.ZipOutputStream):485:504 -> a
-    141:143:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):514:516 -> a
-    144:144:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
-    144:144:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):516 -> a
-    145:156:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):517:528 -> a
-    157:168:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):515:526 -> a
-    169:183:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):514:528 -> a
-    184:191:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):538:545 -> a
-    192:193:java.lang.String extractClassDescriptor(byte[]):582:583 -> a
-    192:193:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):544 -> a
-    194:194:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    194:194:java.lang.String extractClassDescriptor(byte[]):584 -> a
-    194:194:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):544 -> a
-    195:195:java.lang.String extractClassDescriptor(byte[]):589:589 -> a
-    195:195:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):544 -> a
-    196:204:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):546:554 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$300(com.android.tools.r8.utils.AndroidApp):75:75 -> b
-    2:2:com.android.tools.r8.utils.Reporter defaultReporter():184:184 -> b
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():191 -> b
-    3:3:com.android.tools.r8.utils.AndroidApp$Builder builder():191:191 -> b
-    4:13:void writeToDirectory(java.nio.file.Path,com.android.tools.r8.OutputMode):385:394 -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$400(com.android.tools.r8.utils.AndroidApp):75:75 -> c
-    2:3:void closeInternalArchiveProviders():96:97 -> c
-    4:6:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):401:403 -> c
-    7:15:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):402:410 -> c
-    16:22:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):409:415 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$500(com.android.tools.r8.utils.AndroidApp):75:75 -> d
-    2:4:java.util.Collection computeAllProgramResources():228:230 -> d
-    1:1:java.util.List access$600(com.android.tools.r8.utils.AndroidApp):75:75 -> e
-    2:7:java.util.List getClassProgramResourcesForTesting():251:256 -> e
-    1:1:java.util.List access$700(com.android.tools.r8.utils.AndroidApp):75:75 -> f
-    2:2:java.util.List getClasspathResourceProviders():298:298 -> f
-    1:1:com.android.tools.r8.utils.Reporter defaultReporter():184:184 -> g
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):203 -> g
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):208:208 -> g
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):203 -> g
-    3:7:java.util.Set getDataEntryResourcesForTesting():262:266 -> g
-    1:6:java.util.List getDexProgramResourcesForTesting():238:243 -> h
-    1:1:java.util.List getLibraryResourceProviders():303:303 -> i
-    1:1:java.util.List getMainDexClasses():354:354 -> j
-    1:1:java.util.List getMainDexListResources():347:347 -> k
-    1:1:java.util.List getProgramResourceProviders():293:293 -> l
-    1:1:com.android.tools.r8.StringResource getProguardMapOutputData():326:326 -> m
-    1:1:boolean hasMainDexList():333:333 -> n
-    1:1:boolean hasMainDexListResources():340:340 -> o
-    1:9:com.android.tools.r8.utils.AndroidApp withoutMainDexList():359:367 -> p
-    1:5:java.lang.String toString():103:107 -> toString
-    6:8:void printProgramResourceProviders(java.lang.StringBuilder,java.util.Collection):126:128 -> toString
-    6:8:java.lang.String toString():107 -> toString
-    9:20:java.lang.String toString():109:120 -> toString
+    1:1:void <clinit>():79:79 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,java.util.List,java.util.List,com.android.tools.r8.utils.AndroidApp$1):79:79 -> <init>
+    2:12:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.StringResource,java.util.List,java.util.List):180:190 -> <init>
+    java.util.zip.ZipOutputStream lambda$dumpClassFileResources$3(java.util.zip.ZipOutputStream,java.lang.String) -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$200(com.android.tools.r8.utils.AndroidApp):79:79 -> a
+    2:5:void printClassFileProviders(java.lang.StringBuilder,java.util.Collection):153:156 -> a
+    6:12:void printProgramResource(java.lang.StringBuilder,com.android.tools.r8.ProgramResource):162:168 -> a
+    13:14:boolean verifyInternalProvidersInCloseSet(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList):196:197 -> a
+    15:15:boolean lambda$verifyInternalProvidersInCloseSet$0(com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ClassFileResourceProvider):198:198 -> a
+    16:16:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.Reporter):214:214 -> a
+    17:17:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):226:226 -> a
+    18:20:int applicationSize():231:231 -> a
+    22:30:int applicationSize():233:233 -> a
+    31:35:java.util.List filter(java.util.List,com.android.tools.r8.ProgramResource$Kind):326:330 -> a
+    36:39:void write(java.nio.file.Path,com.android.tools.r8.OutputMode):392:395 -> a
+    40:41:java.lang.String getPrimaryClassDescriptor(com.android.tools.r8.Resource):439:440 -> a
+    42:46:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):445:449 -> a
+    47:47:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):448:448 -> a
+    48:48:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):474:474 -> a
+    48:48:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):453 -> a
+    49:49:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):453:453 -> a
+    50:59:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):450:459 -> a
+    60:64:java.util.Map dumpFeatureSplitFileNames(com.android.tools.r8.features.FeatureSplitConfiguration):90:94 -> a
+    60:64:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):462 -> a
+    65:65:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):462:462 -> a
+    66:66:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):460:460 -> a
+    67:68:int dumpClasspathResources(int,java.util.zip.ZipOutputStream):486:487 -> a
+    67:68:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):466 -> a
+    69:70:int dumpLibraryResources(int,java.util.zip.ZipOutputStream):479:480 -> a
+    69:70:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):467 -> a
+    71:71:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):468:468 -> a
+    72:94:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):447:469 -> a
+    95:109:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):523:537 -> a
+    110:110:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    110:110:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):537 -> a
+    111:117:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):538:544 -> a
+    118:152:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):541:575 -> a
+    153:162:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):572:581 -> a
+    163:163:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):536:536 -> a
+    164:211:int dumpProgramResources(java.lang.String,java.util.Map,int,java.util.zip.ZipOutputStream,com.android.tools.r8.features.FeatureSplitConfiguration):535:582 -> a
+    212:215:java.util.zip.ZipOutputStream lambda$dumpProgramResources$2(com.android.tools.r8.features.FeatureSplitConfiguration,java.util.Map,java.util.zip.ZipOutputStream,java.lang.String):555:558 -> a
+    216:229:void closeOutputStreams(java.util.Collection):589:602 -> a
+    230:230:void closeOutputStreams(java.util.Collection):599:599 -> a
+    231:233:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):612:614 -> a
+    234:234:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.<init>():119:119 -> a
+    234:234:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):614 -> a
+    235:251:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):615:631 -> a
+    252:252:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):613:613 -> a
+    253:253:int dumpClassFileResources(java.lang.String,int,java.util.zip.ZipOutputStream,com.android.tools.r8.com.google.common.collect.ImmutableList):612:612 -> a
+    254:260:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):642:648 -> a
+    261:262:java.lang.String extractClassDescriptor(byte[]):687:688 -> a
+    261:262:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):647 -> a
+    263:263:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    263:263:java.lang.String extractClassDescriptor(byte[]):689 -> a
+    263:263:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):647 -> a
+    264:264:java.lang.String extractClassDescriptor(byte[]):694:694 -> a
+    264:264:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):647 -> a
+    265:270:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):649:654 -> a
+    271:276:int dumpProgramResource(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,int,java.util.function.Function,java.util.zip.ZipOutputStream,com.android.tools.r8.ProgramResource):653:658 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$300(com.android.tools.r8.utils.AndroidApp):79:79 -> b
+    2:2:com.android.tools.r8.utils.Reporter defaultReporter():202:202 -> b
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder():209 -> b
+    3:3:com.android.tools.r8.utils.AndroidApp$Builder builder():209:209 -> b
+    4:13:void writeToDirectory(java.nio.file.Path,com.android.tools.r8.OutputMode):403:412 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$400(com.android.tools.r8.utils.AndroidApp):79:79 -> c
+    2:3:void closeInternalArchiveProviders():114:115 -> c
+    4:6:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):419:421 -> c
+    7:15:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):420:428 -> c
+    16:22:void writeToZip(java.nio.file.Path,com.android.tools.r8.OutputMode):427:433 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableList access$500(com.android.tools.r8.utils.AndroidApp):79:79 -> d
+    2:4:java.util.Collection computeAllProgramResources():246:248 -> d
+    1:1:java.util.List access$600(com.android.tools.r8.utils.AndroidApp):79:79 -> e
+    2:7:java.util.List getClassProgramResourcesForTesting():269:274 -> e
+    1:1:java.util.List access$700(com.android.tools.r8.utils.AndroidApp):79:79 -> f
+    2:2:java.util.List getClasspathResourceProviders():316:316 -> f
+    1:1:com.android.tools.r8.utils.Reporter defaultReporter():202:202 -> g
+    1:1:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):221 -> g
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Reporter):226:226 -> g
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder builder(com.android.tools.r8.utils.AndroidApp):221 -> g
+    3:7:java.util.Set getDataEntryResourcesForTesting():280:284 -> g
+    1:6:java.util.List getDexProgramResourcesForTesting():256:261 -> h
+    1:1:java.util.List getLibraryResourceProviders():321:321 -> i
+    1:1:java.util.List getMainDexClasses():372:372 -> j
+    1:1:java.util.List getMainDexListResources():365:365 -> k
+    1:1:java.util.List getProgramResourceProviders():311:311 -> l
+    1:1:com.android.tools.r8.StringResource getProguardMapOutputData():344:344 -> m
+    1:1:boolean hasMainDexList():351:351 -> n
+    1:1:boolean hasMainDexListResources():358:358 -> o
+    1:9:com.android.tools.r8.utils.AndroidApp withoutMainDexList():377:385 -> p
+    1:5:java.lang.String toString():121:125 -> toString
+    6:8:void printProgramResourceProviders(java.lang.StringBuilder,java.util.Collection):144:146 -> toString
+    6:8:java.lang.String toString():125 -> toString
+    9:20:java.lang.String toString():127:138 -> toString
 com.android.tools.r8.utils.AndroidApp$1 -> com.android.tools.r8.utils.e$a:
     java.util.Set val$out -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,java.util.Set):267:267 -> <init>
-    1:6:void visit(com.android.tools.r8.DataEntryResource):277:282 -> visit
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,java.util.Set):285:285 -> <init>
+    1:6:void visit(com.android.tools.r8.DataEntryResource):295:300 -> visit
 com.android.tools.r8.utils.AndroidApp$1ClassNameExtractor -> com.android.tools.r8.utils.f:
     java.lang.String className -> c
-    1:1:void <init>():563:563 -> <init>
-    1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):574:574 -> a
-    1:1:java.lang.String getDescriptor():578:578 -> b
+    1:1:void <init>():668:668 -> <init>
+    1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):679:679 -> a
+    1:1:java.lang.String getDescriptor():683:683 -> b
 com.android.tools.r8.utils.AndroidApp$2 -> com.android.tools.r8.utils.g:
     java.util.Map val$classPathResources -> a
-    1:1:void <init>(java.util.Map):461:461 -> <init>
-    1:1:java.util.Set getClassDescriptors():464:464 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):469:469 -> getProgramResource
+    1:1:void <init>(java.util.Map):494:494 -> <init>
+    1:1:java.util.Set getClassDescriptors():497:497 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):502:502 -> getProgramResource
 com.android.tools.r8.utils.AndroidApp$Builder -> com.android.tools.r8.utils.e$b:
     boolean $assertionsDisabled -> m
     boolean ignoreDexInArchive -> j
@@ -64288,121 +65307,120 @@
     java.util.List mainDexListClasses -> i
     java.util.List mainDexListResources -> h
     java.util.List archiveProvidersToClose -> g
-    1:1:void <clinit>():595:595 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp$1):595:595 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.AndroidApp$1):595:595 -> <init>
-    3:3:void <init>(com.android.tools.r8.utils.Reporter):615:615 -> <init>
-    4:23:void <init>(com.android.tools.r8.utils.Reporter):597:616 -> <init>
-    24:30:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp):621:627 -> <init>
-    1:5:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):640:644 -> a
-    6:20:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):691:705 -> a
-    6:20:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):645 -> a
-    21:31:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):701:711 -> a
-    21:31:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):645 -> a
-    32:39:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):710:717 -> a
-    32:39:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):645 -> a
-    40:46:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):716:722 -> a
-    40:46:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):645 -> a
-    47:74:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):693:720 -> a
-    47:74:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):645 -> a
-    75:80:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):646:651 -> a
-    81:94:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):663:676 -> a
-    95:108:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):672:685 -> a
-    109:109:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$800(java.util.Map):0:0 -> a
-    109:109:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):686 -> a
-    110:110:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.createClassFileResourceProvider(java.util.Map):461:461 -> a
-    110:110:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$800(java.util.Map):75 -> a
-    110:110:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):686 -> a
-    111:111:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):686:686 -> a
-    112:132:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):664:684 -> a
-    133:133:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):684:684 -> a
-    134:135:com.android.tools.r8.utils.AndroidApp$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):778:779 -> a
-    136:136:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):785:785 -> a
-    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):790:790 -> a
-    137:137:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):785 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):798:798 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):791 -> a
-    138:138:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):785 -> a
-    139:139:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):798:798 -> a
-    140:140:com.android.tools.r8.utils.AndroidApp$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):806:806 -> a
-    141:143:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):867:867 -> a
-    144:144:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):880:880 -> a
-    145:148:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):879:882 -> a
-    149:149:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[][]):906:906 -> a
-    150:151:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):911:912 -> a
-    152:152:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):921:921 -> a
-    153:153:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):925:925 -> a
-    154:154:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):931:931 -> a
-    155:155:void addDataResources(com.android.tools.r8.DataResource[]):1074:1074 -> a
-    155:155:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):931 -> a
-    156:156:void addDataResources(java.util.Collection):1078:1078 -> a
-    156:156:void addDataResources(com.android.tools.r8.DataResource[]):1074 -> a
-    156:156:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):931 -> a
-    157:157:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):942:942 -> a
-    158:158:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):969:969 -> a
-    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):976:976 -> a
-    159:159:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):969 -> a
-    160:160:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):992:992 -> a
-    161:200:com.android.tools.r8.utils.AndroidApp build():1000:1039 -> a
-    201:201:void addProgramResources(com.android.tools.r8.ProgramResource[]):1066:1066 -> a
-    202:202:void addProgramResources(java.util.Collection):1070:1070 -> a
-    202:202:void addProgramResources(com.android.tools.r8.ProgramResource[]):1066 -> a
-    203:206:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1083:1086 -> a
-    207:222:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1084:1099 -> a
-    223:223:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    223:223:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1099 -> a
-    224:224:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1099:1099 -> a
-    1:4:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):635:638 -> b
-    5:5:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):637:637 -> b
-    6:6:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):812:812 -> b
-    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.util.Collection):817:818 -> b
-    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):812 -> b
-    9:24:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):831:846 -> b
-    25:25:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):842:842 -> b
-    26:29:com.android.tools.r8.utils.AndroidApp$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):856:859 -> b
-    30:30:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):890:890 -> b
-    31:31:java.util.List getProgramResourceProviders():1104:1104 -> b
-    1:1:com.android.tools.r8.utils.Reporter getReporter():631:631 -> c
-    2:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.nio.file.Path[]):748:748 -> c
-    3:13:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):761:771 -> c
-    14:14:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):767:767 -> c
-    15:15:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFile(java.nio.file.Path):825:825 -> c
-    1:1:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):976:976 -> d
-    2:2:boolean hasMainDexList():981:981 -> d
-    3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1046:1054 -> d
+    1:1:void <clinit>():700:700 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp$1):700:700 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.AndroidApp$1):700:700 -> <init>
+    3:3:void <init>(com.android.tools.r8.utils.Reporter):720:720 -> <init>
+    4:23:void <init>(com.android.tools.r8.utils.Reporter):702:721 -> <init>
+    24:30:void <init>(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.AndroidApp):726:732 -> <init>
+    1:5:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):745:749 -> a
+    6:20:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):796:810 -> a
+    6:20:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):750 -> a
+    21:31:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):806:816 -> a
+    21:31:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):750 -> a
+    32:39:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):815:822 -> a
+    32:39:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):750 -> a
+    40:46:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):821:827 -> a
+    40:46:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):750 -> a
+    47:47:void readProgramDump(com.android.tools.r8.origin.Origin,java.io.InputStream):798:798 -> a
+    47:47:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):750 -> a
+    48:53:void lambda$addDump$0(com.android.tools.r8.origin.Origin,java.util.zip.ZipEntry,java.io.InputStream):751:756 -> a
+    54:67:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):768:781 -> a
+    68:81:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):777:790 -> a
+    82:82:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$800(java.util.Map):0:0 -> a
+    82:82:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):791 -> a
+    83:83:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.createClassFileResourceProvider(java.util.Map):494:494 -> a
+    83:83:com.android.tools.r8.ClassFileResourceProvider com.android.tools.r8.utils.AndroidApp.access$800(java.util.Map):79 -> a
+    83:83:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):791 -> a
+    84:84:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):791:791 -> a
+    85:85:void readClassFileDump(com.android.tools.r8.origin.Origin,java.io.InputStream,java.util.function.Consumer,java.lang.String):769:769 -> a
+    86:87:com.android.tools.r8.utils.AndroidApp$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):883:884 -> a
+    88:88:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):890:890 -> a
+    89:89:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):895:895 -> a
+    89:89:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):890 -> a
+    90:90:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):903:903 -> a
+    90:90:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.util.Collection):896 -> a
+    90:90:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFiles(java.nio.file.Path[]):890 -> a
+    91:91:com.android.tools.r8.utils.AndroidApp$Builder addClasspathFile(java.nio.file.Path):903:903 -> a
+    92:92:com.android.tools.r8.utils.AndroidApp$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):911:911 -> a
+    93:95:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set):972:972 -> a
+    96:96:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):985:985 -> a
+    97:100:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],java.util.Set,java.lang.String):984:987 -> a
+    101:101:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[][]):1011:1011 -> a
+    102:103:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(java.util.Collection):1016:1017 -> a
+    104:104:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):1026:1026 -> a
+    105:105:com.android.tools.r8.utils.AndroidApp$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin,java.util.Set):1030:1030 -> a
+    106:106:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1036:1036 -> a
+    107:107:void addDataResources(com.android.tools.r8.DataResource[]):1179:1179 -> a
+    107:107:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1036 -> a
+    108:108:void addDataResources(java.util.Collection):1183:1183 -> a
+    108:108:void addDataResources(com.android.tools.r8.DataResource[]):1179 -> a
+    108:108:com.android.tools.r8.utils.AndroidApp$Builder addDataResource(com.android.tools.r8.DataResource):1036 -> a
+    109:109:com.android.tools.r8.utils.AndroidApp$Builder setProguardMapOutputData(java.lang.String):1047:1047 -> a
+    110:110:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1074:1074 -> a
+    111:111:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1081:1081 -> a
+    111:111:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.lang.String[]):1074 -> a
+    112:112:com.android.tools.r8.utils.AndroidApp$Builder setIgnoreDexInArchive(boolean):1097:1097 -> a
+    113:152:com.android.tools.r8.utils.AndroidApp build():1105:1144 -> a
+    153:153:void addProgramResources(com.android.tools.r8.ProgramResource[]):1171:1171 -> a
+    154:154:void addProgramResources(java.util.Collection):1175:1175 -> a
+    154:154:void addProgramResources(com.android.tools.r8.ProgramResource[]):1171 -> a
+    155:158:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1188:1191 -> a
+    159:174:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1189:1204 -> a
+    175:175:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    175:175:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1204 -> a
+    176:176:void addClasspathOrLibraryProvider(java.nio.file.Path,java.util.List):1204:1204 -> a
+    1:4:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):740:743 -> b
+    5:5:com.android.tools.r8.utils.AndroidApp$Builder addDump(java.nio.file.Path):742:742 -> b
+    6:6:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):917:917 -> b
+    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.util.Collection):922:923 -> b
+    7:8:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFiles(java.nio.file.Path[]):917 -> b
+    9:24:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):936:951 -> b
+    25:25:com.android.tools.r8.utils.AndroidApp$Builder addFilteredLibraryArchives(java.util.Collection):947:947 -> b
+    26:29:com.android.tools.r8.utils.AndroidApp$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):961:964 -> b
+    30:30:com.android.tools.r8.utils.AndroidApp$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):995:995 -> b
+    31:31:java.util.List getProgramResourceProviders():1209:1209 -> b
+    1:1:com.android.tools.r8.utils.Reporter getReporter():736:736 -> c
+    2:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.nio.file.Path[]):853:853 -> c
+    3:13:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):866:876 -> c
+    14:14:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):872:872 -> c
+    15:15:com.android.tools.r8.utils.AndroidApp$Builder addLibraryFile(java.nio.file.Path):930:930 -> c
+    1:1:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):1081:1081 -> d
+    2:2:boolean hasMainDexList():1086:1086 -> d
+    3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1151:1159 -> d
     12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):73:74 -> d
-    12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1055 -> d
+    12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1160 -> d
     14:14:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> d
-    14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1056 -> d
-    15:19:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1056:1060 -> d
+    14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1161 -> d
+    15:19:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1161:1165 -> d
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> d
-    20:20:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1060 -> d
-    21:21:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1060:1060 -> d
-    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):954:960 -> e
-    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):956:956 -> e
-    1:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.util.Collection):753:754 -> f
+    20:20:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1165 -> d
+    21:21:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):1165:1165 -> d
+    1:7:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1059:1065 -> e
+    8:8:com.android.tools.r8.utils.AndroidApp$Builder addMainDexListFiles(java.util.Collection):1061:1061 -> e
+    1:2:com.android.tools.r8.utils.AndroidApp$Builder addProgramFiles(java.util.Collection):858:859 -> f
 com.android.tools.r8.utils.AndroidApp$Builder$1 -> com.android.tools.r8.utils.i:
     java.util.List val$dataResources -> b
     java.util.List val$programResources -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):723:723 -> <init>
-    1:3:com.android.tools.r8.DataResourceProvider getDataResourceProvider():731:733 -> getDataResourceProvider
-    1:1:java.util.Collection getProgramResources():726:726 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):828:828 -> <init>
+    1:3:com.android.tools.r8.DataResourceProvider getDataResourceProvider():836:838 -> getDataResourceProvider
+    1:1:java.util.Collection getProgramResources():831:831 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$1$1 -> com.android.tools.r8.utils.h:
     com.android.tools.r8.utils.AndroidApp$Builder$1 this$1 -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$1):733:733 -> <init>
-    1:2:void accept(com.android.tools.r8.DataResourceProvider$Visitor):736:737 -> accept
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$1):838:838 -> <init>
+    1:2:void accept(com.android.tools.r8.DataResourceProvider$Visitor):841:842 -> accept
 com.android.tools.r8.utils.AndroidApp$Builder$2 -> com.android.tools.r8.utils.e$b$a:
     java.util.List val$finalDataResources -> b
     java.util.List val$finalProgramResources -> a
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1005:1005 -> <init>
-    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1013:1014 -> getDataResourceProvider
-    1:1:java.util.Collection getProgramResources():1008:1008 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder,java.util.List,java.util.List):1110:1110 -> <init>
+    1:2:com.android.tools.r8.DataResourceProvider getDataResourceProvider():1118:1119 -> getDataResourceProvider
+    1:1:java.util.Collection getProgramResources():1113:1113 -> getProgramResources
 com.android.tools.r8.utils.AndroidApp$Builder$2$1 -> com.android.tools.r8.utils.j:
     com.android.tools.r8.utils.AndroidApp$Builder$2 this$1 -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():1014:1014 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1014:1014 -> <init>
-    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1017:1022 -> accept
+    1:1:void <clinit>():1119:1119 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp$Builder$2):1119:1119 -> <init>
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):1122:1127 -> accept
 com.android.tools.r8.utils.AndroidAppConsumers -> com.android.tools.r8.utils.k:
     com.android.tools.r8.utils.AndroidApp$Builder builder -> a
     boolean $assertionsDisabled -> e
@@ -64514,44 +65532,44 @@
     1:2:void close(com.android.tools.r8.DiagnosticsHandler):51:52 -> a
     3:7:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:71 -> a
     3:7:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
-    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):110:123 -> a
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:124 -> a
     8:21:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):71 -> a
     8:21:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
     22:23:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):73:74 -> a
     22:23:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
     24:29:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    30:35:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):95:100 -> a
-    36:36:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):106:106 -> a
-    37:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):128:133 -> a
-    43:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):132:132 -> a
-    44:53:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):128:137 -> a
-    54:54:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):136:136 -> a
-    55:55:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):134:134 -> a
-    56:56:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):143:143 -> a
-    57:60:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):166:169 -> a
-    61:65:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):155:159 -> a
-    61:65:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):170 -> a
-    66:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):173:173 -> a
-    69:69:java.nio.file.Path getPath():185:185 -> a
+    30:36:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):95:101 -> a
+    37:37:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):107:107 -> a
+    38:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):129:134 -> a
+    44:44:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:133 -> a
+    45:54:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):129:138 -> a
+    55:55:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    56:56:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):135:135 -> a
+    57:57:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):144:144 -> a
+    58:61:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):167:170 -> a
+    62:66:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):156:160 -> a
+    62:66:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171 -> a
+    67:69:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):174:174 -> a
+    70:70:java.nio.file.Path getPath():186:186 -> a
     1:2:java.util.zip.ZipOutputStream getStream():90:91 -> b
     3:4:java.util.zip.ZipOutputStream getStream():90:91 -> b
-    3:4:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148 -> b
-    5:7:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:150 -> b
+    3:4:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):149 -> b
+    5:7:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):149:151 -> b
     1:4:java.util.zip.ZipOutputStream getStreamRaw():80:83 -> c
-    1:1:com.android.tools.r8.origin.Origin getOrigin():180:180 -> getOrigin
+    1:1:com.android.tools.r8.origin.Origin getOrigin():181:181 -> getOrigin
     1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.p:
 com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.utils.q:
     com.android.tools.r8.ByteDataView content -> b
     java.lang.String name -> a
     boolean isDirectory -> c
-    1:1:void <init>(java.lang.String,com.android.tools.r8.ByteDataView,boolean,com.android.tools.r8.utils.ArchiveBuilder$1):188:188 -> <init>
-    2:5:void <init>(java.lang.String,com.android.tools.r8.ByteDataView,boolean):201:204 -> <init>
-    1:1:com.android.tools.r8.utils.ArchiveBuilder$DelayedData createFile(java.lang.String,com.android.tools.r8.ByteDataView):194:194 -> a
-    2:2:com.android.tools.r8.utils.ArchiveBuilder$DelayedData createDirectory(java.lang.String):198:198 -> a
-    1:1:int compareTo(java.lang.Object):188:188 -> compareTo
-    2:4:int compareTo(com.android.tools.r8.utils.ArchiveBuilder$DelayedData):210:212 -> compareTo
-    2:4:int compareTo(java.lang.Object):188 -> compareTo
+    1:1:void <init>(java.lang.String,com.android.tools.r8.ByteDataView,boolean,com.android.tools.r8.utils.ArchiveBuilder$1):189:189 -> <init>
+    2:5:void <init>(java.lang.String,com.android.tools.r8.ByteDataView,boolean):202:205 -> <init>
+    1:1:com.android.tools.r8.utils.ArchiveBuilder$DelayedData createFile(java.lang.String,com.android.tools.r8.ByteDataView):195:195 -> a
+    2:2:com.android.tools.r8.utils.ArchiveBuilder$DelayedData createDirectory(java.lang.String):199:199 -> a
+    1:1:int compareTo(java.lang.Object):189:189 -> compareTo
+    2:4:int compareTo(com.android.tools.r8.utils.ArchiveBuilder$DelayedData):211:213 -> compareTo
+    2:4:int compareTo(java.lang.Object):189 -> compareTo
 com.android.tools.r8.utils.ArchiveResourceProvider -> com.android.tools.r8.utils.ArchiveResourceProvider:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.shaking.FilteredClassPath archive -> b
@@ -64567,13 +65585,12 @@
     68:68:java.util.List readArchive():91 -> a
     69:73:java.util.List readArchive():91:95 -> a
     74:105:java.util.List readArchive():57:88 -> a
-    106:106:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):86:86 -> a
-    107:107:boolean isProgramResourceName(java.lang.String):138:138 -> a
-    108:109:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):143:144 -> a
-    108:109:boolean isProgramResourceName(java.lang.String):138 -> a
-    110:110:boolean isProgramResourceName(java.lang.String):138:138 -> a
+    106:106:boolean isProgramResourceName(java.lang.String):138:138 -> a
+    107:108:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):143:144 -> a
+    107:108:boolean isProgramResourceName(java.lang.String):138 -> a
+    109:109:boolean isProgramResourceName(java.lang.String):138:138 -> a
     1:16:void accept(com.android.tools.r8.DataResourceProvider$Visitor):114:114 -> accept
-    30:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):128:133 -> accept
+    34:35:void accept(com.android.tools.r8.DataResourceProvider$Visitor):132:133 -> accept
     36:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129:130 -> accept
     38:50:void accept(java.util.function.Consumer):142:154 -> accept
     51:60:void accept(java.util.function.Consumer):153:162 -> accept
@@ -64607,7 +65624,11 @@
     boolean value -> a
     1:1:void <init>():11:11 -> <init>
     1:1:boolean get():18:18 -> a
-    2:2:void set(boolean):22:22 -> a
+    2:2:void set(boolean):26:26 -> a
+    1:1:void set(boolean):26:26 -> b
+    1:1:void set():22 -> b
+    1:1:void set(boolean):26:26 -> c
+    1:1:void unset():30 -> c
 com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.utils.x:
     com.android.tools.r8.utils.BooleanLatticeElement BOTTOM -> a
     boolean $assertionsDisabled -> b
@@ -64617,9 +65638,10 @@
     1:9:com.android.tools.r8.utils.BooleanLatticeElement join(com.android.tools.r8.utils.BooleanLatticeElement):56:64 -> a
     boolean isBottom() -> b
     boolean isFalse() -> c
-    1:1:boolean isPossiblyTrue():48:48 -> d
-    boolean isTrue() -> e
-    boolean isUnknown() -> f
+    1:1:boolean isPossiblyFalse():52:52 -> d
+    1:1:boolean isPossiblyTrue():48:48 -> e
+    boolean isTrue() -> f
+    boolean isUnknown() -> g
     1:1:int hashCode():74:74 -> hashCode
 com.android.tools.r8.utils.BooleanLatticeElement$1 -> com.android.tools.r8.utils.x$a:
     1:1:void <init>():9:9 -> <init>
@@ -64633,11 +65655,12 @@
     1:1:java.lang.Boolean[] values():19:19 -> a
 com.android.tools.r8.utils.Box -> com.android.tools.r8.utils.z:
     java.lang.Object value -> a
-    1:1:void <init>():11:11 -> <init>
-    2:3:void <init>(java.lang.Object):13:14 -> <init>
-    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
+    1:1:void <init>():13:13 -> <init>
+    2:3:void <init>(java.lang.Object):15:16 -> <init>
+    1:4:java.lang.Object computeIfAbsent(java.util.function.Supplier):20:23 -> a
+    5:5:java.lang.Object get():27:27 -> a
+    6:6:void set(java.lang.Object):31:31 -> a
+    1:1:boolean isSet():35:35 -> b
 com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.utils.D:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
@@ -64646,29 +65669,29 @@
     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:6:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:35 -> a
-    7:28:void readLineNumbersFromClassFiles():39:60 -> a
-    29:29:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    29:29:void readLineNumbersFromClassFiles():61 -> a
-    30:34:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):45:49 -> a
-    35:35:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
-    35:35:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):50 -> a
+    2:7:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:36 -> a
+    8:29:void readLineNumbersFromClassFiles():40:61 -> a
+    30:30:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    30:30:void readLineNumbersFromClassFiles():62 -> a
+    31:35:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:50 -> a
+    36:36:void com.android.tools.r8.org.objectweb.asm.ClassReader.accept(com.android.tools.r8.org.objectweb.asm.ClassVisitor,int):400:400 -> a
+    36:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):51 -> a
 com.android.tools.r8.utils.CfLineToMethodMapper$1 -> com.android.tools.r8.utils.A:
 com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.utils.B:
     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):84:84 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):88:89 -> <init>
-    4:4:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):86:86 -> <init>
-    1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):100:102 -> 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[]):108:108 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):102:102 -> c
+    1:1:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.CfLineToMethodMapper$1):85:85 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):89:90 -> <init>
+    4:4:void <init>(com.android.tools.r8.utils.CfLineToMethodMapper):87:87 -> <init>
+    1:3:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):101:103 -> 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[]):109:109 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap lambda$visit$0(java.lang.String):103:103 -> c
 com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.utils.C:
     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):113:113 -> <init>
-    2:4:void <init>(java.lang.String,java.util.Map):119:121 -> <init>
-    1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):126:126 -> b
+    1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):114:114 -> <init>
+    2:4:void <init>(java.lang.String,java.util.Map):120:122 -> <init>
+    1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
 com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.utils.E:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
@@ -64746,41 +65769,42 @@
     1:1:java.lang.Object get():234:234 -> get
 com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.utils.O:
     com.android.tools.r8.graph.ClassKind classKind -> a
-    1:2:void <init>(com.android.tools.r8.graph.ClassKind):30:31 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.ClassKind):28:29 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
     java.util.Collection collectTypes() -> a
-    1:1:com.android.tools.r8.utils.ClassProvider forClassFileResources(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader):62:62 -> a
-    2:2:com.android.tools.r8.utils.ClassProvider combine(com.android.tools.r8.graph.ClassKind,java.util.List):78:78 -> a
+    1:1:com.android.tools.r8.utils.ClassProvider forClassFileResources(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader):60:60 -> a
+    2:2:com.android.tools.r8.utils.ClassProvider combine(com.android.tools.r8.graph.ClassKind,java.util.List):76:76 -> a
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.builder():211:211 -> a
-    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
+    3:3:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):66 -> a
+    4:7:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67:70 -> a
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> b
 com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.utils.K:
 com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.utils.L:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
-    1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ClassProvider$1):81:81 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader):88:91 -> <init>
-    1:8:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):96:103 -> a
-    9:11:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):102:104 -> a
-    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
+    1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.utils.ClassProvider$1):79:79 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.ClassFileResourceProvider,com.android.tools.r8.graph.JarApplicationReader):86:89 -> <init>
+    1:7:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):94:100 -> a
+    8:8:void com.android.tools.r8.graph.JarClassFileReader.read(com.android.tools.r8.ProgramResource,com.android.tools.r8.graph.ClassKind):86:86 -> a
+    8:8:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):100 -> a
+    9:9:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):102:102 -> a
+    10:12:java.util.Collection collectTypes():109:111 -> a
+    1:1:java.lang.String toString():118:118 -> toString
 com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.utils.M:
     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
+    1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):148:148 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):152:153 -> <init>
+    1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):158:159 -> a
+    3:5:java.util.Collection collectTypes():165:167 -> a
+    1:8:java.lang.String toString():174:181 -> toString
 com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.utils.N:
     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
+    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):122:122 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):126:127 -> <init>
+    1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):132:133 -> a
+    3:3:java.util.Collection collectTypes():139:139 -> a
+    1:1:java.lang.String toString():144:144 -> toString
 com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.utils.P:
     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
@@ -64801,8 +65825,10 @@
 com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.utils.Q:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.utils.S:
-    void lambda$emptyThrowingConsumer$0(java.lang.Object) -> a
-    1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():10:10 -> a
+    void lambda$emptyConsumer$0(java.lang.Object) -> a
+    1:1:java.util.function.Consumer emptyConsumer():12:12 -> a
+    void lambda$emptyThrowingConsumer$1(java.lang.Object) -> b
+    1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():16:16 -> b
 com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.utils.T:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
@@ -64889,41 +65915,34 @@
     5:5:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(java.lang.String,int,int,byte[]):22:24 -> <init>
     1:1:byte[] getBytes():32:32 -> a
-    2:37:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):40:75 -> a
-    38:38:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):73:73 -> a
-    39:39:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):49:49 -> a
-    40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):46:46 -> a
-    41:41:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):43:43 -> a
-    42:42:java.util.Optional getDexVersion(char,char,char):98:98 -> a
-    43:43:java.util.Optional getDexVersion(char,char,char):96:96 -> a
+    2:38:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):40:76 -> a
+    39:39:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):74:74 -> a
+    40:40:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):50:50 -> a
+    41:41:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):47:47 -> a
+    42:42:com.android.tools.r8.utils.DexVersion getDexVersion(com.android.tools.r8.utils.AndroidApiLevel):44:44 -> a
+    43:43:java.util.Optional getDexVersion(char,char,char):99:99 -> a
+    44:44:java.util.Optional getDexVersion(char,char,char):97:97 -> a
     1:1:int getIntValue():28:28 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):36:36 -> b
-    3:3:java.util.Optional getDexVersion(int):90:90 -> b
-    4:4:java.util.Optional getDexVersion(int):88:88 -> b
-    5:5:java.util.Optional getDexVersion(int):86:86 -> b
-    6:6:java.util.Optional getDexVersion(int):84:84 -> b
-    7:7:java.util.Optional getDexVersion(int):82:82 -> b
-com.android.tools.r8.utils.DiagnosticWithThrowable -> com.android.tools.r8.utils.V:
-    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.W:
+    3:3:java.util.Optional getDexVersion(int):91:91 -> b
+    4:4:java.util.Optional getDexVersion(int):89:89 -> b
+    5:5:java.util.Optional getDexVersion(int):87:87 -> b
+    6:6:java.util.Optional getDexVersion(int):85:85 -> b
+    7:7:java.util.Optional getDexVersion(int):83:83 -> b
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.utils.V:
     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>
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     1:5:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):39:43 -> a
     6:9:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):49:49 -> a
-    11:15:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):51:55 -> a
-    16:16:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):54:54 -> a
+    14:16:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):54:54 -> a
     17:17:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     18:23:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     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.X:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.utils.W:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -64939,7 +65958,7 @@
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> e
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.Y:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.utils.X:
     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
@@ -64955,66 +65974,80 @@
     10:14:int putUnsigned(com.android.tools.r8.dex.DexOutputBuffer,long,int):61:65 -> c
     1:5:long parseUnsigned(com.android.tools.r8.dex.DexReader,int):48:52 -> d
 com.android.tools.r8.utils.ExceptionDiagnostic -> com.android.tools.r8.utils.ExceptionDiagnostic:
-    com.android.tools.r8.origin.Origin origin -> c
-    com.android.tools.r8.position.Position position -> d
-    1:3:void <init>(java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):24:26 -> <init>
-    4:4:void <init>(java.lang.Throwable,com.android.tools.r8.origin.Origin):30:30 -> <init>
-    5:5:void <init>(com.android.tools.r8.ResourceException):34:34 -> <init>
-    1:13:java.lang.String getDiagnosticMessage():49:61 -> getDiagnosticMessage
-    14:14:java.lang.String getDiagnosticMessage():51:51 -> getDiagnosticMessage
-    1:1:com.android.tools.r8.origin.Origin getOrigin():39:39 -> getOrigin
-    1:1:com.android.tools.r8.position.Position getPosition():44:44 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.Z:
-    1:2:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):12:13 -> a
-    3:3:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
-    4:4:boolean com.android.tools.r8.utils.PredicateUtils.lambda$not$0(java.util.function.Predicate,java.lang.Object):21:21 -> a
-    5:5:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.not(java.util.function.Predicate):21:21 -> a
-    6:6:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:29 -> a
-    7:7:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):29:29 -> a
-    8:12:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):39:43 -> a
-    8:12:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):29 -> a
-    13:13:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):33:33 -> a
-    14:18:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):39:43 -> a
-    14:18:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):33 -> a
-    19:33:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
-    34:51:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:86 -> a
-    52:54:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):80:82 -> a
-    55:55:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
-    55:55:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):82 -> a
-    56:61:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
-    56:61:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
-    56:61:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
-    56:61:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):82 -> a
-    62:63:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
-    62:63:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):82 -> a
-    64:66:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):82:84 -> a
-    67:67:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):77:77 -> a
-    68:70:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    68:70:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):77 -> a
-    71:71:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75:75 -> a
-    72:74:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    72:74:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):75 -> a
-    75:75:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
-    76:78:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    76:78:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
-    79:79:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
-    80:86:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):115:121 -> a
-    80:86:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
-    87:87:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71:71 -> a
-    88:90:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    88:90:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):71 -> a
-    91:91:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):88:88 -> a
-    92:101:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):98:107 -> a
-    102:103:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):101:102 -> a
-    104:113:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):125:134 -> a
-    114:115:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):128:129 -> a
+    com.android.tools.r8.origin.Origin origin -> b
+    com.android.tools.r8.position.Position position -> c
+    java.lang.Throwable cause -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:7:void <init>(java.lang.Throwable,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):28:34 -> <init>
+    8:8:void <init>(java.lang.Throwable):38:38 -> <init>
+    9:9:void <init>(java.lang.Throwable,com.android.tools.r8.origin.Origin):42:42 -> <init>
+    10:10:void <init>(com.android.tools.r8.ResourceException):46:46 -> <init>
+    1:1:java.lang.Throwable getCause():60:60 -> getCause
+    1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.utils.Y:
+    void com.android.tools.r8.utils.ForEachableUtils.lambda$empty$0(java.util.function.Consumer) -> a
+    1:1:com.android.tools.r8.utils.ForEachable com.android.tools.r8.utils.ForEachableUtils.empty():10:10 -> a
+    2:3:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):12:13 -> a
+    4:4:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> a
+    5:5:boolean com.android.tools.r8.utils.PredicateUtils.lambda$not$0(java.util.function.Predicate,java.lang.Object):21:21 -> a
+    6:6:java.util.function.Predicate com.android.tools.r8.utils.PredicateUtils.not(java.util.function.Predicate):21:21 -> a
+    7:7:com.android.tools.r8.origin.Origin access$000(java.lang.Throwable):25:25 -> a
+    8:8:void lambda$withConsumeResourceHandler$0(com.android.tools.r8.StringConsumer,java.lang.String,com.android.tools.r8.DiagnosticsHandler):31:31 -> a
+    9:9:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):31:31 -> a
+    10:14:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
+    10:14:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer,java.lang.String):31 -> a
+    15:29:java.lang.String[] com.android.tools.r8.utils.FlagFile.expandFlagFiles(java.lang.String[],java.util.function.Consumer):34:48 -> a
+    30:30:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):35:35 -> a
+    31:35:void withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):41:45 -> a
+    31:35:void withFinishedResourceHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.StringConsumer):35 -> a
+    36:37:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):70:71 -> a
+    38:83:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):81:126 -> a
+    38:83:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    84:84:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88:88 -> a
+    84:84:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
+    84:84:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    85:90:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):37:42 -> a
+    85:90:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> a
+    85:90:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):88 -> a
+    85:90:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
+    85:90:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    91:92:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object,java.lang.Object[]):89:90 -> a
+    91:92:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126 -> a
+    91:92:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    93:93:com.android.tools.r8.CompilationFailedException failCompilation(com.android.tools.r8.utils.Reporter,java.lang.Throwable):126:126 -> a
+    93:93:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73 -> a
+    94:94:void withCompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):73:73 -> a
+    95:104:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):168:177 -> a
+    105:106:void withMainProgramHandler(com.android.tools.r8.utils.ExceptionUtils$MainAction):171:172 -> a
+    107:107:java.lang.RuntimeException unwrapExecutionException(java.util.concurrent.ExecutionException):195:195 -> a
+    108:108:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):208:208 -> a
+    109:111:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):220:222 -> a
+    109:111:void withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Runnable):208 -> a
+    112:112:java.lang.Object lambda$withOriginAndPositionAttachmentHandler$1(java.lang.Runnable):212:212 -> a
+    113:115:java.lang.Object withOriginAndPositionAttachmentHandler(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.util.function.Supplier):220:222 -> a
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierPart(int):14:14 -> b
     1:1:boolean com.android.tools.r8.utils.IdentifierUtils.isDexIdentifierStart(int):10 -> b
+    2:2:com.android.tools.r8.position.Position access$100(java.lang.Throwable):25:25 -> b
     1:2:boolean com.android.tools.r8.utils.IdentifierUtils.isRelaxedDexIdentifierPart(int):18:19 -> c
+    3:4:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):131:132 -> c
+    5:11:com.android.tools.r8.origin.Origin extractIOExceptionOrigin(java.io.IOException):185:191 -> c
+    5:11:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):132 -> c
+    12:24:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):134:146 -> c
     boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
+    1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):150:159 -> d
     boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.Z$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.Z$b:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.utils.Y$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.utils.Y$b:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.utils.Z:
+    com.android.tools.r8.origin.Origin origin -> a
+    com.android.tools.r8.position.Position position -> b
+    1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):237:239 -> <init>
+    1:5:boolean needsAttachment(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):243:247 -> a
+    1:5:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):231 -> a
+    6:6:java.lang.RuntimeException wrap(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):232:232 -> a
 com.android.tools.r8.utils.FeatureClassMapping -> com.android.tools.r8.utils.FeatureClassMapping:
     java.util.Map parsedRules -> a
     java.util.Map parseNonClassRules -> b
@@ -65022,52 +66055,52 @@
     boolean usesOnlyExactMappings -> c
     java.lang.String baseName -> e
     1:1:void <init>(com.android.tools.r8.utils.FeatureClassMapping$1):49:49 -> <init>
-    2:2:void <init>():170:170 -> <init>
+    2:2:void <init>():173:173 -> <init>
     3:10:void <init>():51:58 -> <init>
-    11:11:void <init>(java.util.List):189:189 -> <init>
-    12:153:void <init>(java.util.List):51:192 -> <init>
-    1:10:void addRule(java.lang.String,java.lang.String,int):242:251 -> a
-    11:11:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.isExactmapping():307:307 -> a
-    11:11:void addRule(java.lang.String,java.lang.String,int):251 -> a
-    12:12:void addRule(java.lang.String,java.lang.String,int):251:251 -> a
-    13:13:void error(java.lang.String,int):255:255 -> a
-    1:1:void addBaseMapping(java.lang.String):173:173 -> addBaseMapping
-    1:1:void addBaseNonClassMapping(java.lang.String):177:177 -> addBaseNonClassMapping
-    1:1:void addMapping(java.lang.String,java.lang.String):181:181 -> addMapping
-    1:1:void addNonClassMapping(java.lang.String,java.lang.String):186:186 -> addNonClassMapping
-    1:18:void parseAndAdd(java.lang.String,int):220:237 -> b
-    19:19:void parseAndAdd(java.lang.String,int):232:232 -> b
-    20:20:void parseAndAdd(java.lang.String,int):228:228 -> b
-    1:5:java.lang.String featureForClass(java.lang.String):197:201 -> featureForClass
-    6:11:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.match(java.lang.String):297:302 -> featureForClass
-    6:11:java.lang.String featureForClass(java.lang.String):202 -> featureForClass
-    12:20:java.lang.String featureForClass(java.lang.String):203:211 -> featureForClass
-    1:1:java.lang.String featureForNonClass(java.lang.String):216:216 -> featureForNonClass
+    11:11:void <init>(java.util.List):192:192 -> <init>
+    12:156:void <init>(java.util.List):51:195 -> <init>
+    1:10:void addRule(java.lang.String,java.lang.String,int):245:254 -> a
+    11:11:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.isExactmapping():310:310 -> a
+    11:11:void addRule(java.lang.String,java.lang.String,int):254 -> a
+    12:12:void addRule(java.lang.String,java.lang.String,int):254:254 -> a
+    13:13:void error(java.lang.String,int):258:258 -> a
+    1:1:void addBaseMapping(java.lang.String):176:176 -> addBaseMapping
+    1:1:void addBaseNonClassMapping(java.lang.String):180:180 -> addBaseNonClassMapping
+    1:1:void addMapping(java.lang.String,java.lang.String):184:184 -> addMapping
+    1:1:void addNonClassMapping(java.lang.String,java.lang.String):189:189 -> addNonClassMapping
+    1:18:void parseAndAdd(java.lang.String,int):223:240 -> b
+    19:19:void parseAndAdd(java.lang.String,int):235:235 -> b
+    20:20:void parseAndAdd(java.lang.String,int):231:231 -> b
+    1:5:java.lang.String featureForClass(java.lang.String):200:204 -> featureForClass
+    6:11:boolean com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate.match(java.lang.String):300:305 -> featureForClass
+    6:11:java.lang.String featureForClass(java.lang.String):205 -> featureForClass
+    12:20:java.lang.String featureForClass(java.lang.String):206:214 -> featureForClass
+    1:1:java.lang.String featureForNonClass(java.lang.String):219:219 -> featureForNonClass
     1:1:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path):94:94 -> fromSpecification
-    2:12:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):99:109 -> fromSpecification
-    13:14:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):104:105 -> fromSpecification
+    2:13:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):99:110 -> fromSpecification
+    14:16:com.android.tools.r8.utils.FeatureClassMapping fromSpecification(java.nio.file.Path,com.android.tools.r8.DiagnosticsHandler):104:106 -> fromSpecification
     1:1:java.lang.String getBaseName():66:66 -> getBaseName
 com.android.tools.r8.utils.FeatureClassMapping$1 -> com.android.tools.r8.utils.FeatureClassMapping$a:
     1:1:void <init>():94:94 -> <init>
 com.android.tools.r8.utils.FeatureClassMapping$FeatureMappingException -> com.android.tools.r8.utils.FeatureClassMapping$FeatureMappingException:
-    1:1:void <init>(java.lang.String):262:262 -> <init>
+    1:1:void <init>(java.lang.String):265:265 -> <init>
 com.android.tools.r8.utils.FeatureClassMapping$FeaturePredicate -> com.android.tools.r8.utils.FeatureClassMapping$b:
     java.lang.String predicate -> a
     java.lang.String feature -> b
     boolean isCatchAll -> c
     boolean isWildcard -> d
-    1:1:void <clinit>():268:268 -> <clinit>
-    1:12:void <init>(java.lang.String,java.lang.String):275:286 -> <init>
-    13:23:void <init>(java.lang.String,java.lang.String):283:293 -> <init>
-    24:24:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
+    1:1:void <clinit>():271:271 -> <clinit>
+    1:12:void <init>(java.lang.String,java.lang.String):278:289 -> <init>
+    13:23:void <init>(java.lang.String,java.lang.String):286:296 -> <init>
+    24:24:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
 com.android.tools.r8.utils.FeatureClassMapping$Internal -> com.android.tools.r8.utils.FeatureClassMapping$c:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():114:114 -> <clinit>
-    1:9:java.util.List getClassFileDescriptors(java.lang.String,com.android.tools.r8.DiagnosticsHandler):116:124 -> a
-    10:10:boolean lambda$getNonClassFiles$0(java.util.zip.ZipEntry):131:131 -> a
-    11:31:com.android.tools.r8.utils.FeatureClassMapping fromJarFiles(java.util.List,java.util.List,java.lang.String,com.android.tools.r8.DiagnosticsHandler):144:164 -> a
-    1:7:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):129:129 -> b
-    12:14:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):134:136 -> b
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:10:java.util.List getClassFileDescriptors(java.lang.String,com.android.tools.r8.DiagnosticsHandler):117:126 -> a
+    11:11:boolean lambda$getNonClassFiles$0(java.util.zip.ZipEntry):133:133 -> a
+    12:32:com.android.tools.r8.utils.FeatureClassMapping fromJarFiles(java.util.List,java.util.List,java.lang.String,com.android.tools.r8.DiagnosticsHandler):147:167 -> a
+    1:7:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):131:131 -> b
+    13:15:java.util.List getNonClassFiles(java.lang.String,com.android.tools.r8.DiagnosticsHandler):137:139 -> b
 com.android.tools.r8.utils.FeatureClassMapping$JarFileOrigin -> com.android.tools.r8.utils.FeatureClassMapping$d:
     1:1:void <init>(java.nio.file.Path):84:84 -> <init>
     1:1:java.lang.String part():89:89 -> part
@@ -65101,9 +66134,9 @@
     12:16:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):131:135 -> a
     12:16:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):174 -> a
     17:18:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):181:182 -> a
-    19:29:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):172:182 -> a
-    30:35:java.lang.String withNativeFileSeparators(java.lang.String):186:191 -> a
-    36:49:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):196:209 -> a
+    19:19:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):172:172 -> a
+    20:25:java.lang.String withNativeFileSeparators(java.lang.String):186:191 -> a
+    26:39:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):196:209 -> a
     1:6:boolean isClassFile(java.nio.file.Path):49:54 -> b
     1:2:boolean isDexFile(java.nio.file.Path):39:40 -> c
     1:2:boolean isJarFile(java.nio.file.Path):58:59 -> d
@@ -65144,9 +66177,10 @@
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
 com.android.tools.r8.utils.IntBox -> com.android.tools.r8.utils.h0:
     int value -> a
-    1:2:void <init>(int):13:14 -> <init>
+    1:1:void <init>():11:11 -> <init>
+    2:3:void <init>(int):13:14 -> <init>
     1:1:int getAndIncrement():22:22 -> a
-    2:2:void set(int):26:26 -> a
+    2:2:void set(int):30:30 -> a
 com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.utils.i0:
     void accept(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.j0:
@@ -65173,428 +66207,437 @@
     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.k0:
-    boolean enablePropagationOfConstantsAtCallSites -> P
+    java.util.function.BiPredicate dexClassChecksumFilter -> P
+    boolean enableValuePropagation -> f0
     boolean printMemory -> i
     java.lang.String dumpInputToFile -> j
-    boolean enableStringSwitchConversion -> b0
+    boolean enableEnumSwitchMapRemoval -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
+    java.util.List methodsFilter -> w0
     boolean enableFieldAssignmentTracker -> q
-    boolean debug -> V0
-    boolean $assertionsDisabled -> w1
+    boolean enableInheritanceClassInDexDistributor -> Z0
+    java.util.Set reportedMissingForDesugaring -> r1
     boolean enableInlining -> y
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> h1
-    boolean forceProguardCompatibility -> R0
-    com.android.tools.r8.StringConsumer configurationConsumer -> l1
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> V0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> h1
+    boolean skipIR -> R0
     boolean enableClassStaticizer -> G
-    boolean enableMainDexListCheck -> N0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> q1
+    int classInliningInstructionAllowance -> T
+    boolean ignoreMissingClasses -> N0
     boolean printTimes -> h
-    boolean enableLoadStoreOptimization -> E0
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> S0
+    boolean lookupLibraryBeforeProgram -> J0
+    boolean enableNestBasedAccessDesugaring -> E0
     boolean enableSideEffectAnalysis -> I
-    boolean enableInheritanceClassInDexDistributor -> b1
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> y0
-    boolean enableKotlinMetadataRewritingForRenamedClasses -> Q
-    int threadCount -> p0
+    int threadCount -> l0
+    java.util.Set extensiveLoggingFilter -> u0
+    boolean cfToCfDesugar -> Q
     boolean enableFieldBitAccessAnalysis -> r
-    boolean hasMarker -> v0
+    boolean readCompileTimeAnnotations -> z0
+    boolean enableStringSwitchConversion -> Y
+    int minApiLevel -> x0
     boolean enableEnumUnboxing -> z
-    boolean verbose -> r0
+    boolean enableCfByteCodePassThrough -> r0
     java.util.List outputInspections -> g
     boolean enableInitializedClassesAnalysis -> H
-    int callGraphLikelySpuriousCallEdgeThreshold -> U
-    boolean enablePcDebugInfoOutput -> n0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> K0
-    java.util.Map warningInvalidParameterAnnotations -> e1
-    boolean enableValuePropagationForInstanceFields -> j0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> f0
+    int inliningInstructionLimit -> U
+    boolean verbose -> n0
+    boolean enablePcDebugInfoOutput -> j0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> G0
     boolean enableTreeShakingOfLibraryMethodOverrides -> N
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> W0
     boolean libraryInterfacesMayHaveStaticInitialization -> o
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> g0
+    com.android.tools.r8.dex.Marker marker -> t0
+    boolean enableUninstantiatedTypeOptimization -> g0
     boolean enableDevirtualization -> w
-    java.util.Set invalidLibraryClasses -> u1
-    java.util.function.Consumer syntheticProguardRulesConsumer -> s1
+    int SUPPORTED_DEX_VERSION -> t1
+    boolean debug -> S0
     boolean disableInliningOfLibraryMethodOverrides -> E
-    int classInliningInstructionLimit -> V
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> m1
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> W0
-    boolean enableTreeShaking -> O0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> i1
+    int inliningInstructionAllowance -> V
+    boolean forceProguardCompatibility -> O0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> i1
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    int minimumStringSwitchSize -> c0
-    boolean enablePropagationOfDynamicTypesAtCallSites -> O
-    boolean enableLambdaMerging -> F0
-    java.util.Map missingEnclosingMembers -> d1
-    boolean skipReadingDexCode -> g1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> n1
+    boolean relocatorCompilation -> l1
+    boolean enableMainDexListCheck -> K0
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> m1
+    boolean encodeChecksums -> O
+    boolean enableNestReduction -> F0
+    java.util.Map warningInvalidDebugInfo -> d1
     boolean enableDynamicTypeOptimization -> p
     java.lang.String dumpInputToDirectory -> k
-    boolean intermediate -> B0
-    java.util.Set extensiveLoggingFilter -> x0
+    boolean enableLoadStoreOptimization -> B0
     boolean enableNonNullTracking -> x
+    java.util.List mainDexKeepRules -> X0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean quiet -> s0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> c1
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> J0
+    boolean hasMarker -> s0
     boolean enableClassInlining -> F
-    int classInliningInstructionAllowance -> W
-    boolean enableUninstantiatedTypeOptimization -> k0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> G0
+    int inliningMonitorEnterValuesAllowance -> W
+    boolean quiet -> o0
     java.util.Set neverMergePrefixes -> n
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> r1
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableNeverMergePrefixes -> m
-    boolean enableEnumValueOptimization -> d0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> d0
     boolean enableNameReflectionOptimization -> L
     boolean enableArgumentRemoval -> u
-    java.util.Set reportedMissingForDesugaring -> t1
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean cfToCfDesugar -> T
-    boolean configurationDebugging -> T0
-    boolean enableMinification -> P0
-    int inliningInstructionLimit -> X
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> X0
-    boolean processCovariantReturnTypeAnnotations -> L0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> j1
-    boolean enableNestBasedAccessDesugaring -> H0
+    boolean $assertionsDisabled -> u1
+    int inliningControlFlowResolutionBlocksThreshold -> X
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> f1
+    boolean enableTreeShaking -> L0
+    com.android.tools.r8.StringConsumer configurationConsumer -> j1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> o1
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> C
-    java.util.List logArgumentsFilter -> D0
     boolean enableStringConcatenationOptimization -> M
-    boolean readCompileTimeAnnotations -> C0
+    java.util.Map warningInvalidParameterAnnotations -> c1
+    boolean enableLambdaMerging -> C0
     boolean enableUnusedInterfaceRemoval -> v
-    boolean invalidDebugInfoFatal -> t0
-    int inliningInstructionAllowance -> Y
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> l0
-    boolean enableRedundantFieldLoadElimination -> h0
+    boolean invalidDebugInfoFatal -> p0
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> D0
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> h0
     boolean enableInliningOfInvokesWithNullableReceivers -> D
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Y0
-    boolean enableEnumSwitchMapRemoval -> e0
-    int minApiLevel -> A0
+    boolean enableRedundantFieldLoadElimination -> e0
+    java.util.List logArgumentsFilter -> A0
     boolean enableDeterminismAnalysis -> J
-    java.util.List methodsFilter -> z0
-    boolean encodeChecksums -> R
+    boolean enableEnumValueOptimization -> a0
+    java.util.Set invalidLibraryClasses -> s1
+    boolean minimalMainDex -> Y0
     boolean enableHorizontalClassMerging -> s
-    boolean skipIR -> U0
-    int inliningMonitorEnterValuesAllowance -> Z
-    boolean ignoreMissingClasses -> Q0
-    int SUPPORTED_DEX_VERSION -> v1
-    boolean relocatorCompilation -> n1
-    boolean lookupLibraryBeforeProgram -> M0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> k1
-    java.lang.String synthesizedClassPrefix -> o0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> p1
+    java.util.function.Consumer syntheticProguardRulesConsumer -> q1
+    int minimumStringSwitchSize -> Z
+    boolean configurationDebugging -> Q0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> g1
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> U0
+    boolean enableMinification -> M0
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> k1
     boolean applyInliningToInlinee -> A
-    boolean enableNestReduction -> I0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> o1
+    int callGraphLikelySpuriousCallEdgeThreshold -> R
+    boolean processCovariantReturnTypeAnnotations -> I0
+    java.lang.String synthesizedClassPrefix -> k0
+    java.util.Map missingEnclosingMembers -> b1
+    boolean skipReadingDexCode -> e1
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    int inliningControlFlowResolutionBlocksThreshold -> a0
-    boolean minimalMainDex -> a1
-    java.util.List mainDexKeepRules -> Z0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> v0
     boolean enableServiceLoaderRewriting -> K
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> P0
     boolean passthroughDexCode -> l
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> T0
     int applyInliningToInlineeMaxDepth -> B
-    java.util.function.BiPredicate dexClassChecksumFilter -> S
+    boolean intermediate -> y0
     boolean enableVerticalClassMerging -> t
-    boolean ignoreMainDexMissingClasses -> u0
-    boolean useSmaliSyntax -> q0
-    boolean enableRedundantConstNumberOptimization -> m0
-    java.util.Map warningInvalidDebugInfo -> f1
-    boolean enableValuePropagation -> i0
-    com.android.tools.r8.dex.Marker marker -> w0
-    1:21:void <clinit>():78:98 -> <clinit>
-    1:1:void <init>():124:124 -> <init>
-    2:608:void <init>():116:722 -> <init>
-    609:613:void <init>():125:129 -> <init>
-    614:614:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):133:133 -> <init>
-    615:1221:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):116:722 -> <init>
-    1222:1229:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):134:141 -> <init>
-    1230:1230:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):145:145 -> <init>
-    1231:1837:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):116:722 -> <init>
-    1838:1851:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):146:159 -> <init>
-    1:2:void enablePropagationOfConstantsAtCallSites():1127:1128 -> A
-    1:5:void enableProtoShrinking():164:168 -> B
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():574:582 -> C
-    1:9:java.util.Set getExtensiveLoggingFilter():548:556 -> D
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():354:354 -> E
-    2:2:boolean isGeneratingDexIndexed():393:393 -> E
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():355 -> E
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():356:356 -> E
-    4:4:boolean isGeneratingDexFilePerClassFile():397:397 -> E
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():357 -> E
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():358:358 -> E
-    6:6:boolean isGeneratingClassFiles():401:401 -> E
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():359 -> E
-    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():360:362 -> E
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():109:109 -> F
-    1:1:boolean hasConsumer():350:350 -> G
-    1:1:boolean hasMethodsFilter():944:944 -> H
-    1:1:boolean hasProguardConfiguration():105:105 -> I
-    1:1:boolean hasUsageInformationConsumer():669:669 -> J
-    1:1:boolean isCallSiteOptimizationEnabled():1132:1132 -> K
-    1:1:boolean isDesugaredLibraryCompilation():366:366 -> L
-    1:1:boolean isGeneratingClassFiles():401:401 -> M
-    1:1:boolean isGeneratingDexIndexed():393:393 -> N
-    1:1:boolean isGeneratingDex():389 -> N
-    2:2:boolean isGeneratingDexFilePerClassFile():397:397 -> N
-    2:2:boolean isGeneratingDex():389 -> N
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1202:1207 -> O
-    1:1:boolean isMinifying():496:496 -> P
-    1:1:boolean isShrinking():492:492 -> Q
-    1:1:boolean isStringSwitchConversionEnabled():1211:1211 -> R
-    1:2:boolean keepInnerClassStructure():500:501 -> S
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():540:540 -> T
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():536:536 -> U
-    1:1:int requiredCfVersionForConstClassInstructions():1151:1151 -> V
-    2:2:boolean isGeneratingClassFiles():401:401 -> V
-    2:2:int requiredCfVersionForConstClassInstructions():1151 -> V
-    3:3:int requiredCfVersionForConstClassInstructions():1151:1151 -> V
-    1:1:boolean shouldBackportMethods():374:374 -> W
-    1:4:boolean shouldDesugarNests():439:442 -> X
-    5:5:boolean isGeneratingClassFiles():401:401 -> X
-    5:5:boolean canUseNestBasedAccess():1180 -> X
-    5:5:boolean shouldDesugarNests():442 -> X
-    1:1:boolean shouldKeepStackMapTable():378:378 -> Y
-    2:2:boolean isRelocatorCompilation():370:370 -> Y
-    2:2:boolean shouldKeepStackMapTable():378 -> Y
-    3:4:boolean shouldKeepStackMapTable():378:379 -> Y
-    5:5:boolean isRelocatorCompilation():370:370 -> Y
-    5:5:boolean shouldKeepStackMapTable():380 -> Y
-    6:6:boolean shouldKeepStackMapTable():381:381 -> Y
-    1:1:boolean isShrinking():492:492 -> Z
-    1:1:boolean shouldRerunEnqueuer():385 -> Z
-    2:2:boolean isMinifying():496:496 -> Z
-    2:2:boolean shouldRerunEnqueuer():385 -> Z
-    3:3:boolean shouldRerunEnqueuer():385:385 -> Z
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> a1
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> p1
+    boolean ignoreMainDexMissingClasses -> q0
+    boolean useSmaliSyntax -> m0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> c0
+    int classInliningInstructionLimit -> S
+    boolean enableRedundantConstNumberOptimization -> i0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> H0
+    1:21:void <clinit>():79:99 -> <clinit>
+    1:1:void <init>():125:125 -> <init>
+    2:608:void <init>():117:723 -> <init>
+    609:613:void <init>():126:130 -> <init>
+    614:614:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):134:134 -> <init>
+    615:1221:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):117:723 -> <init>
+    1222:1229:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):135:142 -> <init>
+    1230:1230:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):146:146 -> <init>
+    1231:1837:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):117:723 -> <init>
+    1838:1851:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):147:160 -> <init>
+    1:1:void disableNameReflectionOptimization():1171:1171 -> A
+    1:5:void enableProtoShrinking():165:169 -> B
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():575:583 -> C
+    1:9:java.util.Set getExtensiveLoggingFilter():549:557 -> D
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():349:349 -> E
+    2:2:boolean isGeneratingDexIndexed():388:388 -> E
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():350 -> E
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():351:351 -> E
+    4:4:boolean isGeneratingDexFilePerClassFile():392:392 -> E
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():352 -> E
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():353:353 -> E
+    6:6:boolean isGeneratingClassFiles():396:396 -> E
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():354 -> E
+    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():355:357 -> E
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():110:110 -> F
+    1:1:boolean hasConsumer():345:345 -> G
+    1:1:boolean hasMethodsFilter():942:942 -> H
+    1:1:boolean hasProguardConfiguration():106:106 -> I
+    1:1:boolean hasUsageInformationConsumer():670:670 -> J
+    1:1:boolean isDesugaredLibraryCompilation():361:361 -> K
+    1:1:boolean isGeneratingClassFiles():396:396 -> L
+    1:1:boolean isGeneratingDexIndexed():388:388 -> M
+    1:1:boolean isGeneratingDex():384 -> M
+    2:2:boolean isGeneratingDexFilePerClassFile():392:392 -> M
+    2:2:boolean isGeneratingDex():384 -> M
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1236:1241 -> N
+    1:1:boolean isMinifying():491:491 -> O
+    1:1:boolean isShrinking():487:487 -> P
+    1:1:boolean isStringSwitchConversionEnabled():1245:1245 -> Q
+    1:2:boolean keepInnerClassStructure():495:496 -> R
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():541:541 -> S
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():537:537 -> T
+    1:1:int requiredCfVersionForConstClassInstructions():1185:1185 -> U
+    2:2:boolean isGeneratingClassFiles():396:396 -> U
+    2:2:int requiredCfVersionForConstClassInstructions():1185 -> U
+    3:3:int requiredCfVersionForConstClassInstructions():1185:1185 -> U
+    1:1:boolean shouldBackportMethods():369:369 -> V
+    1:4:boolean shouldDesugarNests():434:437 -> W
+    5:5:boolean isGeneratingClassFiles():396:396 -> W
+    5:5:boolean canUseNestBasedAccess():1214 -> W
+    5:5:boolean shouldDesugarNests():437 -> W
+    1:1:boolean shouldKeepStackMapTable():373:373 -> X
+    2:2:boolean isRelocatorCompilation():365:365 -> X
+    2:2:boolean shouldKeepStackMapTable():373 -> X
+    3:4:boolean shouldKeepStackMapTable():373:374 -> X
+    5:5:boolean isRelocatorCompilation():365:365 -> X
+    5:5:boolean shouldKeepStackMapTable():375 -> X
+    6:6:boolean shouldKeepStackMapTable():376:376 -> X
+    1:1:boolean isShrinking():487:487 -> Y
+    1:1:boolean shouldRerunEnqueuer():380 -> Y
+    2:2:boolean isMinifying():491:491 -> Y
+    2:2:boolean shouldRerunEnqueuer():380 -> Y
+    3:3:boolean shouldRerunEnqueuer():380:380 -> Y
+    1:18:void signalFinishedToConsumers():412:429 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:48:com.android.tools.r8.references.MethodReference com.android.tools.r8.graph.DexMethod.asMethodReference(com.android.tools.r8.graph.AppView):0:47 -> a
-    1:48:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):882 -> a
-    49:49:com.android.tools.r8.references.MethodReference com.android.tools.r8.graph.DexMethod.asMethodReference(com.android.tools.r8.graph.AppView):45:45 -> a
-    49:49:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):882 -> a
-    50:51:void setMarker(com.android.tools.r8.dex.Marker):313:314 -> a
-    52:53:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):318:319 -> a
-    54:61:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):326:333 -> a
-    54:61:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):321 -> a
-    62:62:boolean isGeneratingClassFiles():401:401 -> a
-    62:62:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):334 -> a
-    62:62:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):321 -> a
-    63:72:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):335:344 -> a
-    63:72:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):321 -> a
-    73:73:boolean assertionsEnabled():709:709 -> a
-    74:74:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):725:725 -> a
-    75:75:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):747:747 -> a
-    76:82: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):841:847 -> a
-    83:83: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):842:842 -> a
-    84:85:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):854:855 -> a
-    86:86:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> a
-    86:86:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):857 -> a
-    87:93:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):857:863 -> a
-    94:94:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):855:855 -> a
-    95:104:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set,com.android.tools.r8.graph.AppView):874:883 -> a
-    105:105:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set,com.android.tools.r8.graph.AppView):875:875 -> a
-    106:109:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):888:891 -> a
-    110:114:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):896:900 -> a
-    115:121:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):905:911 -> a
-    122:122:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):906:906 -> a
-    123:123:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):910:910 -> a
-    124:144:void warningInvalidSignature(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):916:936 -> a
-    145:150:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):949:954 -> a
-    151:152:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1141:1142 -> a
-    153:153:boolean canUseConstClassInstructions(int):1146:1146 -> a
-    154:154:boolean isGeneratingClassFiles():401:401 -> a
-    154:154:boolean canUseConstClassInstructions(int):1146 -> a
-    155:156:boolean canUseConstClassInstructions(int):1146:1147 -> a
-    1:18:void signalFinishedToConsumers():417:434 -> a0
-    1:3:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):781:783 -> b
-    4:9:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):797:802 -> b
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> b
-    10:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):802 -> b
-    11:38:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):804:831 -> b
-    39:39:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):899:899 -> b
-    40:40:boolean canHaveArtCheckCastVerifierBug():1536:1536 -> b
-    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):763:763 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> c
-    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):764 -> c
-    3:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):765:767 -> c
-    6:6:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):747:747 -> c
-    6:6:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):768 -> c
-    7:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):772:773 -> c
-    9:9:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> c
-    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):775 -> c
-    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):775:775 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):835:835 -> c
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):777 -> c
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):777:777 -> c
-    13:13:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):773:773 -> c
-    14:16:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):790:792 -> c
-    17:17:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):890:890 -> c
-    18:19:boolean canHaveArtInstanceOfVerifierBug():1491:1492 -> c
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):736:739 -> d
-    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> d
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):741 -> d
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):741:743 -> d
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):739:739 -> d
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):725:725 -> d
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):737 -> d
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):751:751 -> d
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):216:216 -> d
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):752 -> d
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753:753 -> d
-    14:14:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):747:747 -> d
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):754 -> d
-    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):758:758 -> d
-    16:16:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):835:835 -> d
-    16:16:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):758 -> d
-    17:17:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):758:758 -> d
-    18:18:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1568:1568 -> d
-    1:1:boolean isGeneratingClassFiles():401:401 -> e
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1560 -> e
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1560:1560 -> e
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):729:732 -> e
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):725:725 -> e
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):730 -> e
-    1:1:boolean isGeneratingClassFiles():401:401 -> f
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1582 -> f
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1582:1582 -> f
-    1:1:boolean isGeneratingClassFiles():401:401 -> g
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1238 -> g
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1238:1238 -> g
-    1:1:boolean isGeneratingClassFiles():401:401 -> h
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1184 -> h
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1184:1184 -> h
-    1:1:boolean isGeneratingClassFiles():401:401 -> i
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1228 -> i
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1228:1228 -> i
-    1:1:boolean isGeneratingClassFiles():401:401 -> j
-    1:1:boolean canUseConstantMethodHandle():1164 -> j
-    2:2:boolean canUseConstantMethodHandle():1164:1164 -> j
-    1:1:boolean isGeneratingClassFiles():401:401 -> k
-    1:1:boolean canUseConstantMethodType():1168 -> k
-    2:2:boolean canUseConstantMethodType():1168:1168 -> k
-    1:1:boolean isGeneratingClassFiles():401:401 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1176 -> l
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1176:1176 -> l
-    1:2:boolean canUseFilledNewArrayOfObjects():1250:1251 -> m
-    1:1:boolean isGeneratingClassFiles():401:401 -> n
-    1:1:boolean canUseInvokeCustom():1172 -> n
-    2:2:boolean canUseInvokeCustom():1172:1172 -> n
-    1:1:boolean isGeneratingClassFiles():401:401 -> o
-    1:1:boolean canUseInvokePolymorphic():1160 -> o
-    2:2:boolean canUseInvokePolymorphic():1160:1160 -> o
-    1:1:boolean isGeneratingClassFiles():401:401 -> p
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1156 -> p
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1156:1156 -> p
-    1:2:boolean canUseMultidex():1215:1216 -> q
-    1:1:boolean isGeneratingClassFiles():401:401 -> r
-    1:1:boolean canUseNotInstruction():1286 -> r
-    2:2:boolean canUseNotInstruction():1286:1286 -> r
-    1:1:boolean isGeneratingClassFiles():401:401 -> s
-    1:1:boolean canUsePrivateInterfaceMethods():1192 -> s
-    2:2:boolean canUsePrivateInterfaceMethods():1192:1192 -> s
-    1:1:boolean canUseRequireNonNull():1220:1220 -> t
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1259:1260 -> u
-    1:1:boolean isGeneratingClassFiles():401:401 -> v
-    1:1:boolean canUseSuppressedExceptions():1224 -> v
-    2:2:boolean canUseSuppressedExceptions():1224:1224 -> v
-    1:1:boolean isGeneratingClassFiles():401:401 -> w
-    1:1:boolean canUseTwrCloseResourceMethod():1188 -> w
-    2:2:boolean canUseTwrCloseResourceMethod():1188:1188 -> w
-    1:4:void disableAllOptimizations():172:175 -> x
-    1:18:void disableGlobalOptimizations():179:196 -> y
-    1:1:void disableNameReflectionOptimization():1121:1121 -> z
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.utils.k0$a:
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):308:309 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):313:314 -> a
+    5:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):321:328 -> a
+    5:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):316 -> a
+    13:13:boolean isGeneratingClassFiles():396:396 -> a
+    13:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):329 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):316 -> a
+    14:23:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):330:339 -> a
+    14:23:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):316 -> a
+    24:24:boolean assertionsEnabled():710:710 -> a
+    25:25:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):726:726 -> a
+    26:26:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):748:748 -> a
+    27:33:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):842:848 -> a
+    34:34:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):843:843 -> a
+    35:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):855:856 -> a
+    37:37:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):858 -> a
+    38:44:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):858:864 -> a
+    45:45:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):856:856 -> a
+    46:53:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):874:881 -> a
+    54:54:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):875:875 -> a
+    55:58:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):886:889 -> a
+    59:63:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):894:898 -> a
+    64:70:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):903:909 -> a
+    71:71:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):904:904 -> a
+    72:72:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):908:908 -> a
+    73:93:void warningInvalidSignature(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.origin.Origin,java.lang.String,java.lang.reflect.GenericSignatureFormatError):914:934 -> a
+    94:99:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):947:952 -> a
+    100:101:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1175:1176 -> a
+    102:102:boolean canUseConstClassInstructions(int):1180:1180 -> a
+    103:103:boolean isGeneratingClassFiles():396:396 -> a
+    103:103:boolean canUseConstClassInstructions(int):1180 -> a
+    104:105:boolean canUseConstClassInstructions(int):1180:1181 -> a
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():533:533 -> b
+    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):782:784 -> b
+    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):798:803 -> b
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> b
+    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):803 -> b
+    12:39:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):805:832 -> b
+    40:40:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):897:897 -> b
+    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):764:764 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> c
+    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):765 -> c
+    3:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):766:768 -> c
+    6:6:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):748:748 -> c
+    6:6:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):769 -> c
+    7:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):773:774 -> c
+    9:9:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> c
+    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):776 -> c
+    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):776:776 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> c
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):778 -> c
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):778:778 -> c
+    13:13:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):774:774 -> c
+    14:16:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):791:793 -> c
+    17:17:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):888:888 -> c
+    18:18:boolean canHaveArtCheckCastVerifierBug():1570:1570 -> c
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):737:740 -> d
+    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> d
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):742 -> d
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):742:744 -> d
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):740:740 -> d
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):726:726 -> d
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):738 -> d
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):752:752 -> d
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> d
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):753 -> d
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):754:754 -> d
+    14:14:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):748:748 -> d
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):755 -> d
+    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):759:759 -> d
+    16:16:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> d
+    16:16:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):759 -> d
+    17:17:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):759:759 -> d
+    18:19:boolean canHaveArtInstanceOfVerifierBug():1525:1526 -> d
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):730:733 -> e
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):726:726 -> e
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):731 -> e
+    6:6:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1602:1602 -> e
+    1:1:boolean isGeneratingClassFiles():396:396 -> f
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1594 -> f
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1594:1594 -> f
+    1:1:boolean isGeneratingClassFiles():396:396 -> g
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1616 -> g
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1616:1616 -> g
+    1:1:boolean isGeneratingClassFiles():396:396 -> h
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1272 -> h
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1272:1272 -> h
+    1:1:boolean isGeneratingClassFiles():396:396 -> i
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1218 -> i
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1218:1218 -> i
+    1:1:boolean isGeneratingClassFiles():396:396 -> j
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1262 -> j
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1262:1262 -> j
+    1:1:boolean isGeneratingClassFiles():396:396 -> k
+    1:1:boolean canUseConstantMethodHandle():1198 -> k
+    2:2:boolean canUseConstantMethodHandle():1198:1198 -> k
+    1:1:boolean isGeneratingClassFiles():396:396 -> l
+    1:1:boolean canUseConstantMethodType():1202 -> l
+    2:2:boolean canUseConstantMethodType():1202:1202 -> l
+    1:1:boolean isGeneratingClassFiles():396:396 -> m
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1210 -> m
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1210:1210 -> m
+    1:2:boolean canUseFilledNewArrayOfObjects():1284:1285 -> n
+    1:1:boolean isGeneratingClassFiles():396:396 -> o
+    1:1:boolean canUseInvokeCustom():1206 -> o
+    2:2:boolean canUseInvokeCustom():1206:1206 -> o
+    1:1:boolean isGeneratingClassFiles():396:396 -> p
+    1:1:boolean canUseInvokePolymorphic():1194 -> p
+    2:2:boolean canUseInvokePolymorphic():1194:1194 -> p
+    1:1:boolean isGeneratingClassFiles():396:396 -> q
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1190 -> q
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1190:1190 -> q
+    1:2:boolean canUseMultidex():1249:1250 -> r
+    1:1:boolean isGeneratingClassFiles():396:396 -> s
+    1:1:boolean canUseNotInstruction():1320 -> s
+    2:2:boolean canUseNotInstruction():1320:1320 -> s
+    1:1:boolean isGeneratingClassFiles():396:396 -> t
+    1:1:boolean canUsePrivateInterfaceMethods():1226 -> t
+    2:2:boolean canUsePrivateInterfaceMethods():1226:1226 -> t
+    1:1:boolean canUseRequireNonNull():1254:1254 -> u
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1293:1294 -> v
+    1:1:boolean isGeneratingClassFiles():396:396 -> w
+    1:1:boolean canUseSuppressedExceptions():1258 -> w
+    2:2:boolean canUseSuppressedExceptions():1258:1258 -> w
+    1:1:boolean isGeneratingClassFiles():396:396 -> x
+    1:1:boolean canUseTwrCloseResourceMethod():1222 -> x
+    2:2:boolean canUseTwrCloseResourceMethod():1222:1222 -> x
+    1:4:void disableAllOptimizations():173:176 -> y
+    1:17:void disableGlobalOptimizations():180:196 -> z
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.utils.k0$a:
+    boolean enableConstantPropagation -> a
+    boolean enableTypePropagation -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():990:990 -> <clinit>
+    1:11:void <init>():990:1000 -> <init>
+    1:2:void disableOptimization():1003:1004 -> a
+    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):990 -> a
+    3:3:void disableTypePropagationForTesting():1008:1008 -> a
+    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1014:1015 -> a
+    1:1:boolean isConstantPropagationEnabled():1027:1027 -> b
+    1:1:boolean isEnabled():1023:1023 -> c
+    1:1:boolean isTypePropagationEnabled():1031:1031 -> d
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.utils.k0$b:
     com.android.tools.r8.utils.InternalOptions$DesugarState ONLY_BACKPORT_STATICS -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
-    1:4:void <clinit>():90:93 -> <clinit>
-    1:1:void <init>(java.lang.String,int):89:89 -> <init>
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.k0$b:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,int):626:626 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.k0$c:
+    1:4:void <clinit>():91:94 -> <clinit>
+    1:1:void <init>(java.lang.String,int):90:90 -> <init>
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.utils.k0$c:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,int):627:627 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.utils.k0$d:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():987:989 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.k0$d:
+    1:3:void <init>():985:987 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.k0$e:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
-    1:2:void <clinit>():85:86 -> <clinit>
-    1:1:void <init>(java.lang.String,int):84:84 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.k0$e:
+    1:2:void <clinit>():86:87 -> <clinit>
+    1:1:void <init>(java.lang.String,int):85:85 -> <init>
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.utils.k0$f:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():976:984 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.k0$f:
+    1:9:void <init>():974:982 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.k0$g:
     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>():969:973 -> <clinit>
-    6:6:void <clinit>():967:967 -> <clinit>
-    1:1:void <init>(java.lang.String,int):967:967 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.k0$g:
+    1:5:void <clinit>():967:971 -> <clinit>
+    6:6:void <clinit>():965:965 -> <clinit>
+    1:1:void <init>(java.lang.String,int):965:965 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.utils.k0$h:
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:6:void <init>():992:997 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():1000:1000 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.k0$h:
-    boolean enableCheckCastAndInstanceOfRemoval -> m
-    java.util.Set validInliningReasons -> w
-    boolean allowOutlinerInterfaceArrayArguments -> N
-    boolean enableInvokeSuperToInvokeVirtualRewriting -> o
-    boolean measureProguardIfRuleEvaluations -> P
-    boolean allowInvokeErrors -> i
-    boolean allowNonAbstractClassesWithAbstractMethods -> J
-    boolean allowClassInlinerGracefulExit -> k
-    java.util.function.Consumer callSiteOptimizationInfoInspector -> R
-    boolean verifyKeptGraphInfo -> L
-    boolean dontCreateMarkerInD8 -> u
-    boolean enableEnumUnboxingDebugLogs -> q
+    1:6:void <init>():1035:1040 -> <init>
+    1:1:boolean isProtoShrinkingEnabled():1043:1043 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.k0$i:
+    boolean reportUnusedProguardConfigurationRules -> m
+    boolean readInputStackMaps -> N
+    boolean enableDeadSwitchCaseElimination -> o
+    boolean allowTypeErrors -> i
+    java.util.function.Consumer callSiteOptimizationInfoInspector -> T
+    boolean assertConsistentRenamingOfSignature -> J
+    boolean disableL8AnnotationRemoval -> k
+    boolean enableForceNestBasedAccessDesugaringForTest -> L
+    boolean placeExceptionalBlocksLast -> u
+    boolean forceJumboStringProcessing -> w
+    boolean enableSwitchToIfRewriting -> q
     com.android.tools.r8.utils.IROrdering irOrdering -> b
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> O
-    boolean invertConditionals -> s
-    java.util.function.Consumer waveModifier -> d
-    boolean forceNameReflectionOptimization -> y
-    java.util.function.Consumer irModifier -> A
-    boolean allowCheckDiscardedErrors -> f
-    boolean forceLibBackportsInL8CfToCf -> G
+    int basicBlockMuncherIterationLimit -> C
+    boolean measureProguardIfRuleEvaluations -> R
+    boolean forceRedundantConstNumberRemoval -> s
+    boolean noLocalsTableOnInput -> y
+    boolean deterministicSortingBasedOnDexType -> E
+    boolean addCallEdgesForLibraryInvokes -> f
+    boolean trackDesugaredAPIConversions -> G
     java.util.function.BiConsumer enqueuerInspector -> c
-    boolean allowTypeErrors -> h
-    java.io.PrintStream whyAreYouNotInliningConsumer -> E
-    boolean dontReportFailingCheckDiscarded -> C
-    boolean readInputStackMaps -> M
-    boolean enableDeadSwitchCaseElimination -> n
-    boolean enableSwitchToIfRewriting -> p
-    boolean assertConsistentRenamingOfSignature -> I
-    boolean disableL8AnnotationRemoval -> j
-    boolean enableForceNestBasedAccessDesugaringForTest -> K
-    boolean reportUnusedProguardConfigurationRules -> l
-    boolean forceJumboStringProcessing -> v
-    boolean noLocalsTableOnInput -> x
-    int basicBlockMuncherIterationLimit -> B
-    boolean forceRedundantConstNumberRemoval -> r
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> Q
-    boolean placeExceptionalBlocksLast -> t
+    boolean allowInjectedAnnotationMethods -> h
+    boolean enableNarrowingChecksInD8 -> A
+    boolean verifyKeptGraphInfo -> M
+    boolean enableCheckCastAndInstanceOfRemoval -> n
+    java.util.Set validInliningReasons -> x
+    boolean allowOutlinerInterfaceArrayArguments -> O
+    boolean enableInvokeSuperToInvokeVirtualRewriting -> p
+    java.util.function.BiConsumer methodProcessingIdConsumer -> d
+    boolean enumUnboxingRewriteJavaCGeneratedMethod -> I
+    boolean allowInvokeErrors -> j
+    boolean allowNonAbstractClassesWithAbstractMethods -> K
+    boolean allowClassInlinerGracefulExit -> l
+    boolean dontCreateMarkerInD8 -> v
+    java.util.function.Predicate cfByteCodePassThrough -> U
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> P
+    boolean enableEnumUnboxingDebugLogs -> r
+    boolean invertConditionals -> t
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> S
     byte[] forceDexVersionBytes -> a
-    boolean enableNarrowingChecksInD8 -> z
-    boolean addCallEdgesForLibraryInvokes -> e
-    boolean trackDesugaredAPIConversions -> F
-    boolean allowInjectedAnnotationMethods -> g
-    boolean enumUnboxingRewriteJavaCGeneratedMethod -> H
-    boolean deterministicSortingBasedOnDexType -> D
-    1:109:void <init>():1006:1114 -> <init>
+    boolean forceNameReflectionOptimization -> z
+    java.util.function.Consumer irModifier -> B
+    boolean allowCheckDiscardedErrors -> g
+    java.io.PrintStream whyAreYouNotInliningConsumer -> F
+    java.util.function.Consumer waveModifier -> e
+    boolean forceLibBackportsInL8CfToCf -> H
+    java.lang.Runnable hookInIrConversion -> Q
+    boolean dontReportFailingCheckDiscarded -> D
+    1:116:void <init>():1049:1164 -> <init>
     void lambda$new$0(java.util.Deque) -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.k0$h$a:
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.k0$i$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1091:1093 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1097:1098 -> 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):1098:1098 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.k0$h$b:
+    1:3:void <init>():1139:1141 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1145:1146 -> 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):1146:1146 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.k0$i$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1108:1111 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.k0$i:
-    1:1:void <init>(int,com.android.tools.r8.graph.DexType):638:638 -> <init>
+    1:4:void <init>():1156:1159 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.k0$j:
+    1:1:void <init>(int,com.android.tools.r8.graph.DexType):639:639 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -65604,11 +66647,13 @@
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
 com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.utils.m0:
-    1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):23:23 -> a
-    1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):13:14 -> b
-    1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):23:23 -> c
+    1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):36:36 -> a
+    2:2:int size(java.lang.Iterable):41:41 -> a
+    1:2:int firstIndexMatching(java.lang.Iterable,java.util.function.Predicate):26:27 -> b
+    3:4:java.util.List toNewArrayList(java.lang.Iterable):48:49 -> b
+    1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):36:36 -> c
     2:23:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):0:21 -> c
-    2:23:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):23 -> c
+    2:23:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):36 -> c
 com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.o0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -65638,7 +66683,11 @@
     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.r0:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.utils.r0:
+    java.util.function.Supplier supplier -> b
+    1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
+    1:1:java.lang.Object computeIfAbsent():18:18 -> c
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.s0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -65649,7 +66698,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.s0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.t0:
     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
@@ -65659,69 +66708,69 @@
     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.B0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.C0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():61:61 -> <clinit>
     1:1:void access$1200(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):61:61 -> a
     2:2:com.android.tools.r8.ir.code.Position access$900(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):61:61 -> a
     3: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):270:283 -> a
-    17:19:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):513:515 -> a
+    17:19:void addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):515:517 -> 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:61: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:335 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1197:1197 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1231:1231 -> a
     62:62:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):335 -> a
     63:63:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):335:335 -> a
-    64:67:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):706:709 -> a
+    64:67:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):708:711 -> a
     64:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):336 -> a
     68:68:void com.android.tools.r8.utils.Pair.<init>():20:20 -> a
-    68:68:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):709 -> a
+    68:68:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):711 -> a
     68:68: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 -> a
-    69:102:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):711:744 -> a
+    69:102:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):713:746 -> a
     69:102:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):336 -> a
-    103:111:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):741:749 -> a
+    103:111:void optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):743:751 -> a
     103:111:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):336 -> a
-    112:207:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):600:695 -> a
+    112:207:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):602:697 -> a
     112:207:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):338 -> a
-    208:211:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):754:757 -> a
-    208:211:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):696 -> a
+    208:211:boolean verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.graph.DexDebugInfo):756:759 -> a
+    208:211:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):698 -> a
     208:211: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):338 -> a
-    212:212:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):698:698 -> a
+    212:212:void optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,boolean):700:700 -> a
     212:212: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):338 -> a
-    213:213:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):341:341 -> a
-    214:237:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):768:791 -> a
-    214:237: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):342 -> a
-    238:238:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):784:784 -> a
-    238:238:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):342 -> a
-    239: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):346:377 -> a
-    271:271:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
-    271:271:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):377 -> a
-    272:312: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):378:418 -> a
-    313:323: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):416:426 -> a
-    324:336: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):423:435 -> a
-    337:338: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
-    339:339: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
-    340:341: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):369:370 -> a
-    342:344: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):373:373 -> a
-    345:358:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):475:488 -> a
-    359:359:void sortMethods(java.util.List):497:497 -> a
-    360:361:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):499:500 -> a
-    362:362:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1217:1217 -> a
-    362:362:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):503 -> a
-    363:363:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):524:524 -> a
-    364:370: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):526:532 -> a
-    371:371:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
-    371:371: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):532 -> a
-    372:372: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):533:533 -> a
-    373:380:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):540:547 -> a
-    381:388:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):558:565 -> a
-    381:388:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):548 -> a
-    389:391:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):549:551 -> a
-    392:392:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):550:550 -> a
-    393:398:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):571:576 -> a
-    399:401:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):584:586 -> 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):797:800 -> b
-    5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):812:815 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.t0:
+    213:215:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):341:343 -> a
+    216:239:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):770:793 -> a
+    216:239:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):344 -> a
+    240:240:void optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.graph.AppView):786:786 -> a
+    240:240:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):344 -> a
+    241:272: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):348:379 -> a
+    273:273:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
+    273:273:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):379 -> a
+    274:314:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):380:420 -> a
+    315:325: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):418:428 -> a
+    326:338: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):425:437 -> a
+    339:340: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
+    341:341: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
+    342:343: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):371:372 -> a
+    344:346: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):375:375 -> a
+    347:360:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):477:490 -> a
+    361:361:void sortMethods(java.util.List):499:499 -> a
+    362:363:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):501:502 -> a
+    364:364:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1220:1220 -> a
+    364:364:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):505 -> a
+    365:365:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):526:526 -> a
+    366:372: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):528:534 -> a
+    373:373:void com.android.tools.r8.naming.MemberNaming.<init>(com.android.tools.r8.naming.MemberNaming$Signature,java.lang.String):61:61 -> a
+    373:373: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):534 -> a
+    374:374: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):535:535 -> a
+    375:382:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):542:549 -> a
+    383:390:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):560:567 -> a
+    383:390:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):550 -> a
+    391:393:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):551:553 -> a
+    394:394:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):552:552 -> a
+    395:400:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):573:578 -> a
+    401:403:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):586:588 -> 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):799:802 -> b
+    5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):814:817 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.u0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
@@ -65729,31 +66778,31 @@
     java.util.List val$mappedPositions -> j
     int emittedPc -> g
     java.util.List val$processedEvents -> l
-    1:1:void <clinit>():612:612 -> <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):612:615 -> <init>
-    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):628:641 -> a
-    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):650:650 -> a
-    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):655:655 -> a
-    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):660:660 -> a
-    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):667:668 -> a
-    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):673:674 -> a
-    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):679:680 -> a
-    1:3:void flushPc():619:621 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.utils.u0:
+    1:1:void <clinit>():614:614 -> <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):614:617 -> <init>
+    1:14:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):630:643 -> a
+    15:15:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):652:652 -> a
+    16:16:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):657:657 -> a
+    17:17:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):662:662 -> a
+    18:19:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):669:670 -> a
+    20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):675:676 -> a
+    22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):681:682 -> a
+    1:3:void flushPc():621:623 -> f
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.utils.Pair val$lastPosition -> g
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> h
     boolean $assertionsDisabled -> j
     java.util.List val$mappedPositions -> i
-    1:1:void <clinit>():712:712 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):712:712 -> <init>
-    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):715:721 -> a
-    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):718:731 -> a
-    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):726:726 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.v0:
+    1:1:void <clinit>():714:714 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):714:714 -> <init>
+    1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):717:723 -> a
+    8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):720:733 -> a
+    22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):728:728 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.w0:
     1:1:void <init>():69:69 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):69:69 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):73:73 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.utils.x0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -65770,7 +66819,7 @@
     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):216:216 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):246:246 -> 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
@@ -65778,13 +66827,13 @@
     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):73:75 -> a
+    37:39:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> 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):79:81 -> a
+    40:42:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> 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.x0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.y0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -65795,7 +66844,7 @@
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):248:248 -> b
     1:1:com.android.tools.r8.graph.DexMethod 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.y0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.z0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -65805,7 +66854,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):83:83 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):79:87 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):92:106 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.z0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.A0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -65823,12 +66872,12 @@
     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.A0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.B0:
     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.C0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.D0:
     1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):33:34 -> a
     3:5:java.util.List map(java.util.Collection,java.util.function.Function):42:44 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.E0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -65844,7 +66893,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.E0:
+com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.F0:
     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
@@ -65856,10 +66905,10 @@
     15:15:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
     16:31:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):35:50 -> a
     32:32:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-    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:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> 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.F0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.G0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -65873,7 +66922,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.G0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.H0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -65887,14 +66936,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.H0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.I0:
     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.I0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.J0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -65903,11 +66952,12 @@
     1:1:void <clinit>():13:13 -> <clinit>
     1:6:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ProgramResource$Kind,byte[],java.util.Set):26:31 -> <init>
     1:1:com.android.tools.r8.utils.OneShotByteResource create(com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,byte[],java.util.Set):22:22 -> a
-    1:3:java.io.InputStream getByteStream():46:48 -> getByteStream
-    1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
+    1:1:java.io.InputStream getByteStream():46:46 -> getByteStream
+    1:3:byte[] getBytes():51:53 -> getBytes
+    1:1:java.util.Set getClassDescriptors():59:59 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.utils.K0:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -65916,16 +66966,16 @@
     com.android.tools.r8.utils.OptionalBool asOptionalBool() -> a
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.J0$a:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.utils.K0$a:
     1:1:void <init>():10:10 -> <init>
-    boolean isTrue() -> e
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.J0$b:
+    boolean isTrue() -> f
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.utils.K0$b:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.J0$c:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.utils.K0$c:
     1:1:void <init>():38:38 -> <init>
-    boolean isUnknown() -> f
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.K0:
+    boolean isUnknown() -> g
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.L0:
     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
@@ -65933,21 +66983,21 @@
     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.K0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.L0$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.OutputBuilder -> com.android.tools.r8.utils.L0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.M0:
     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.M0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.N0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -65957,7 +67007,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.utils.N0:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.utils.O0:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -65965,7 +67015,7 @@
     2:2:void addPredicate(java.util.function.Predicate):24:24 -> a
     3:9:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):28:34 -> a
     1:5:boolean contains(java.lang.Object):39:43 -> b
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.O0:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.P0:
     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>
@@ -65975,8 +67025,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.O0$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.O0$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.P0$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.P0$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -65985,11 +67035,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.O0$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.P0$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.P0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.Q0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -66004,45 +67054,51 @@
     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):64:68 -> 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):85:85 -> 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):69 -> a
-    18:19:boolean assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):93:94 -> a
-    18:19: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):86 -> a
-    18:19:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
-    20:20: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:89 -> a
-    20:20:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
-    21:21:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
+    18:20:boolean assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    18:20: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):86 -> a
+    18:20:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
+    22:22:boolean assertEqualClasses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):95:95 -> a
+    22:22: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):86 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
+    23: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):89:89 -> a
+    23:23:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
+    24:24:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
     1:3:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:79 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():537:537 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():542:542 -> b
     4:4:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
     5:5:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> b
-    6:8:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):75:77 -> 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):77 -> b
+    6:6:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.Q0:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.utils.R0:
+    com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
+    1:1:void <clinit>():12:12 -> <clinit>
+    1:1:void <init>():14:14 -> <init>
+    1:1:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> c
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):10:10 -> doEquivalent
+    2:2:boolean doEquivalent(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> doEquivalent
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):10 -> doEquivalent
+    1:1:int doHash(java.lang.Object):10:10 -> doHash
+    2:2:int doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> doHash
+    2:2:int doHash(java.lang.Object):10 -> doHash
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.S0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
-    com.android.tools.r8.Diagnostic lastError -> c
-    java.util.Collection suppressedExceptions -> d
-    int errorCount -> b
-    1:1:void <init>():24:24 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):27:27 -> <init>
-    3:12:void <init>(com.android.tools.r8.DiagnosticsHandler):19:28 -> <init>
-    1:1:void error(java.lang.String):53:53 -> a
-    2:5:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):57:60 -> a
-    6:8:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):75:77 -> a
-    9:27:void failIfPendingErrors():93:111 -> a
-    28:28:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):115:115 -> a
-    1:4:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):57:60 -> b
-    1:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):84 -> b
-    5:6:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):85:86 -> b
-    7:7:java.lang.RuntimeException fatalError(java.lang.String):67:67 -> b
-    8:10:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):75:77 -> b
-    8:10:java.lang.RuntimeException fatalError(java.lang.String):67 -> b
-    1:3:void error(com.android.tools.r8.Diagnostic):47:49 -> 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.Q0$a:
-    1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.R0:
+    com.android.tools.r8.utils.AbortException abort -> b
+    1:1:void <init>():15:15 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):18:18 -> <init>
+    3:10:void <init>(com.android.tools.r8.DiagnosticsHandler):12:19 -> <init>
+    1:1:void error(java.lang.String):43:43 -> a
+    2:3:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):57:58 -> a
+    4:5:void failIfPendingErrors():63:64 -> a
+    1:1:java.lang.RuntimeException fatalError(java.lang.String):50:50 -> b
+    2:3:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):57:58 -> b
+    2:3:java.lang.RuntimeException fatalError(java.lang.String):50 -> b
+    1:2:void error(com.android.tools.r8.Diagnostic):38:39 -> error
+    1:1:void info(com.android.tools.r8.Diagnostic):24:24 -> info
+    1:1:void warning(com.android.tools.r8.Diagnostic):29:29 -> warning
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.S0$a:
+    1:1:void <init>():15:15 -> <init>
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.utils.T0:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -66055,21 +67111,23 @@
     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.S0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.U0:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.T0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.V0:
     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
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String):28:28 -> <init>
     2:2:void <init>(java.lang.String,com.android.tools.r8.origin.Origin):32:32 -> <init>
-    3:6:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):35:38 -> <init>
-    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.U0:
+    3:9:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):35:41 -> <init>
+    1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.W0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -66108,7 +67166,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> d
     1:9:java.lang.String trim(java.lang.String):292:300 -> e
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):159:163 -> f
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.U0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.W0$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
@@ -66117,7 +67175,7 @@
     1:4:void <clinit>():26:29 -> <clinit>
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.V0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.X0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -66126,57 +67184,69 @@
     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.V0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.X0$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.W0:
-    1:1:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):24:24 -> a
-    2:3:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):37:38 -> a
-    4:18:java.util.Collection awaitFuturesWithResults(java.util.Collection):92:106 -> a
-    4:18:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):39 -> a
-    19:29:java.util.Collection awaitFuturesWithResults(java.util.Collection):99:109 -> a
-    19:29:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):39 -> a
-    30:30:java.lang.Object lambda$processItemsWithResults$1(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object):38:38 -> a
-    31:31:void lambda$processItemsWithResults$2(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingFunction,java.lang.Object):38:38 -> a
-    32:32:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):45:45 -> a
-    33:33:void lambda$processItems$3(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.Map$Entry):52:52 -> a
-    34:34:void processItems(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):52:52 -> a
-    35:35:void processItems(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):51:51 -> a
-    36:36:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):58:58 -> a
-    37:37:java.lang.Object lambda$processItems$4(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object):61:61 -> a
-    38:51:void awaitFutures(java.lang.Iterable):69:82 -> a
-    52:62:void awaitFutures(java.lang.Iterable):75:85 -> a
-    63:63:java.util.concurrent.ExecutorService getExecutorService(int):129:129 -> a
-    64:64:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):124:124 -> a
-    64:64:java.util.concurrent.ExecutorService getExecutorService(int):130 -> a
-    65:65:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):134:134 -> a
-    1:1:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):117:117 -> b
-    2:2:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):124:124 -> b
-    2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):118 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.X0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.Y0:
+com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.Y0:
+    1:1:java.lang.Object lambda$processItemsWithResults$0(com.android.tools.r8.utils.ThrowingFunction,java.lang.Object,int):24:24 -> a
+    2:2:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingFunction,java.util.concurrent.ExecutorService):24:24 -> a
+    3:3:java.util.Collection processItemsWithResults(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):32:32 -> a
+    4:6:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):46:48 -> a
+    7:21:java.util.Collection awaitFuturesWithResults(java.util.Collection):134:148 -> a
+    7:21:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):53 -> a
+    22:34:java.util.Collection awaitFuturesWithResults(java.util.Collection):141:153 -> a
+    22:34:java.util.Collection processItemsWithResults(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.util.concurrent.ExecutorService):53 -> a
+    35:36:void lambda$processItemsWithResults$3(com.android.tools.r8.utils.IntBox,java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object):50:51 -> a
+    37:37:java.lang.Object lambda$processItemsWithResults$2(com.android.tools.r8.utils.ThrowingReferenceIntFunction,java.lang.Object,int):51:51 -> a
+    38:38:void lambda$processItems$4(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):59:59 -> a
+    39:39:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):59:59 -> a
+    40:40:void processItems(java.lang.Iterable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):67:67 -> a
+    41:41:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingConsumer,java.util.concurrent.ExecutorService):73:73 -> a
+    42:42:void processItems(com.android.tools.r8.utils.ForEachable,com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.util.concurrent.ExecutorService):81:81 -> a
+    43:43:java.lang.Object lambda$processItems$6(com.android.tools.r8.utils.ThrowingReferenceIntConsumer,java.lang.Object,int):84:84 -> a
+    44:44:void processMap(java.util.Map,com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):93:93 -> a
+    45:45:java.lang.Object lambda$processMap$7(com.android.tools.r8.utils.ThrowingBiConsumer,java.lang.Object,java.lang.Object):96:96 -> a
+    46:46:java.lang.Object lambda$processMapWithResults$8(com.android.tools.r8.utils.ThrowingBiFunction,java.util.Map$Entry):106:106 -> a
+    47:47:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):106:106 -> a
+    48:48:java.util.Collection processMapWithResults(java.util.Map,com.android.tools.r8.utils.ThrowingBiFunction,java.util.concurrent.ExecutorService):105:105 -> a
+    49:62:void awaitFutures(java.lang.Iterable):111:124 -> a
+    63:75:void awaitFutures(java.lang.Iterable):117:129 -> a
+    76:76:java.util.concurrent.ExecutorService getExecutorService(int):171:171 -> a
+    77:77:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):166:166 -> a
+    77:77:java.util.concurrent.ExecutorService getExecutorService(int):172 -> a
+    78:78:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):176:176 -> a
+    1:1:void lambda$processItems$5(com.android.tools.r8.utils.ThrowingConsumer,java.lang.Object,int):73:73 -> b
+    2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):159:159 -> b
+    3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):166:166 -> b
+    3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):160 -> b
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.Z0:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.utils.a1:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.b1:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.Z0:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.utils.a1:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.b1:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.c1:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.utils.d1:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.e1:
     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.c1:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.f1:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.d1:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.g1:
     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.e1:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.g1:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.utils.h1:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.utils.i1:
+    java.lang.Object apply(java.lang.Object,int) -> a
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.j1:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.l1:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -66221,20 +67291,20 @@
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
     2:3:void end():374:375 -> c
     1:6:void report():379:384 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.utils.g1$a:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.utils.l1$a:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.utils.f1:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.utils.k1:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.g1$b:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.l1$b:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.g1$c:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.l1$c:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -66297,7 +67367,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():156 -> toString
     5:5:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.utils.g1$d:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.utils.l1$d:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -66313,7 +67383,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):305:305 -> a
     25:26:void end():315:316 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):225:225 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.utils.h1:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.utils.m1:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -66332,19 +67402,21 @@
     39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):259:259 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> b
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.utils.i1:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.utils.n1:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):279:281 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.utils.j1:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.utils.o1:
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> a
     com.android.tools.r8.utils.TraversalContinuation BREAK -> b
     1:2:void <clinit>():8:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean shouldBreak():12:12 -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.k1:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.utils.p1:
+    void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.q1:
     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.l1:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.r1:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -66363,7 +67435,7 @@
     2:2:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.utils.m1:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.utils.s1:
     com.android.tools.r8.utils.Visibility[] $VALUES -> e
     com.android.tools.r8.utils.Visibility PUBLIC -> a
     com.android.tools.r8.utils.Visibility PROTECTED -> b
@@ -66374,7 +67446,7 @@
     1:1:void <init>(java.lang.String,int):9:9 -> <init>
     1:1:com.android.tools.r8.utils.Visibility[] values():9:9 -> a
     1:15:java.lang.String toString():33:47 -> toString
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.utils.n1:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.utils.u1:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -66388,7 +67460,12 @@
     1:1:com.android.tools.r8.utils.WorkList newIdentityWorkList():29:29 -> b
     2:3:com.android.tools.r8.utils.WorkList newIdentityWorkList(java.lang.Iterable):33:34 -> b
     1:2:java.lang.Object next():69:70 -> c
-com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.o1:
+com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.utils.t1:
+    com.android.tools.r8.utils.WorkList$EqualityTest IDENTITY -> b
+    com.android.tools.r8.utils.WorkList$EqualityTest HASH -> a
+    1:2:void <clinit>():74:75 -> <clinit>
+    1:1:void <init>(java.lang.String,int):73:73 -> <init>
+com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.v1:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():37:37 -> <clinit>
@@ -66396,64 +67473,102 @@
     1:12:void writeResourcesToZip(java.util.List,java.util.Set,com.android.tools.r8.com.google.common.io.Closer,java.util.zip.ZipOutputStream):45:56 -> a
     13:19:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):65:71 -> a
     20:24:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):69:73 -> a
-    25:33:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):65:73 -> a
-    34:34:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):73:73 -> a
-    35:47:void zip(java.nio.file.Path,java.nio.file.Path):77:77 -> a
-    58:58:void zip(java.nio.file.Path,java.nio.file.Path):88:88 -> a
-    59:59:boolean lambda$zip$0(java.nio.file.Path):80:80 -> a
-    60:60:java.util.List unzip(java.lang.String,java.io.File):92:92 -> a
-    61:63:java.util.List unzip(java.lang.String,java.io.File,java.util.function.Predicate):97:99 -> a
-    64:76:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):100:112 -> a
-    77:79:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):109:111 -> a
-    80:80:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104:104 -> a
-    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    81:81:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104 -> a
-    82:82:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104:104 -> a
-    83:83:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,byte[],int):121:121 -> a
-    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
+    25:25:void iter(java.lang.String,com.android.tools.r8.utils.ZipUtils$OnEntryHandler):65:65 -> a
+    26:38:void zip(java.nio.file.Path,java.nio.file.Path):77:77 -> a
+    39:39:boolean lambda$zip$0(java.nio.file.Path):80:80 -> a
+    40:40:java.util.List unzip(java.lang.String,java.io.File):92:92 -> a
+    41:43:java.util.List unzip(java.lang.String,java.io.File,java.util.function.Predicate):97:99 -> a
+    44:56:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):100:112 -> a
+    57:57:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):109:109 -> a
+    58:58:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104:104 -> a
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    59:59:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104 -> a
+    60:60:void lambda$unzip$2(java.util.function.Predicate,java.nio.file.Path,java.util.List,java.util.zip.ZipEntry,java.io.InputStream):104:104 -> a
+    61:61:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,byte[],int):121:121 -> a
+    62:74:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):127:139 -> a
+    75:82: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.o1$a:
+com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.v1$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.utils.p1.a:
-    java.util.Set methods -> a
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.utils.w1.a:
+    com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>():17:17 -> <init>
-    1:1:void add(com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-    2:2:void addAll(java.lang.Iterable):26:26 -> a
-    3:7:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView):30:34 -> a
-    8:8:boolean isEmpty():40:40 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.utils.p1.b:
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder create():22:22 -> a
+    2:2:void add(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
+    3:4:com.android.tools.r8.utils.collections.ProgramMethodMultiset build(com.android.tools.r8.graph.AppView):34:35 -> a
+    5:7:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):37:39 -> a
+    1:1:int size():30:30 -> b
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.utils.w1.b:
+    java.util.Set methods -> b
+    java.util.function.IntFunction factory -> a
+    1:1:void <init>(java.util.function.IntFunction):22:22 -> <init>
+    2:5:void <init>(java.util.function.IntFunction):20:23 -> <init>
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder create():27:27 -> a
+    2:2:com.android.tools.r8.utils.collections.SortedProgramMethodSet lambda$createSorted$0(int):31:31 -> a
+    3:3:void add(com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    4:8:com.android.tools.r8.utils.collections.ProgramMethodSet build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):56:60 -> a
+    1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createSorted():31:31 -> b
+    2:7:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense):43:48 -> b
+    1:1:boolean isEmpty():66:66 -> c
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.utils.w1.c:
+    java.util.Map backing -> a
+    boolean $assertionsDisabled -> b
+    1:3:void <clinit>():19:21 -> <clinit>
+    1:2:void <init>(java.util.Map):25:26 -> <init>
+    1:2:boolean add(com.android.tools.r8.graph.ProgramField):38:39 -> a
+    3:3:boolean com.android.tools.r8.graph.ProgramField.isStructurallyEqualTo(com.android.tools.r8.graph.ProgramField):14:14 -> a
+    3:3:boolean add(com.android.tools.r8.graph.ProgramField):39 -> a
+    4:4:boolean add(com.android.tools.r8.graph.ProgramField):39:39 -> a
+    1:1:com.android.tools.r8.utils.collections.ProgramFieldSet create():30:30 -> c
+    1:1:java.util.Iterator iterator():73:73 -> iterator
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.utils.w1.d:
+    com.android.tools.r8.com.google.common.collect.Multiset backing -> a
+    1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):20:21 -> <init>
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createHash():25:25 -> a
+    2:2:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
+    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMethod):37:37 -> a
+    3:3:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29 -> a
+    4:4:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
+    5:5:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
+    6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):33:33 -> a
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.utils.w1.e:
     java.util.Map backing -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> b
     boolean $assertionsDisabled -> c
     1:3:void <clinit>():21:23 -> <clinit>
-    1:2:void <init>(java.util.Map):27:28 -> <init>
-    1:2:boolean add(com.android.tools.r8.graph.ProgramMethod):58:59 -> a
-    3:3:boolean com.android.tools.r8.graph.ProgramMethod.isStructurallyEqualTo(com.android.tools.r8.graph.ProgramMethod):38:38 -> a
-    3:3:boolean add(com.android.tools.r8.graph.ProgramMethod):59 -> a
-    4:4:boolean add(com.android.tools.r8.graph.ProgramMethod):59:59 -> a
-    5:5:void addAll(java.lang.Iterable):64:64 -> a
-    6:6:void addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):68:68 -> a
-    7:7:boolean createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):72:72 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    9:9:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():257:257 -> a
-    9:9:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):76 -> a
-    10:10:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    11:11:void lambda$toDefinitionSet$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):116:116 -> a
-    1:1:boolean contains(com.android.tools.r8.graph.ProgramMethod):80:80 -> b
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():257:257 -> b
-    2:2:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):102 -> b
-    3:3:boolean remove(com.android.tools.r8.graph.DexMethod):97:97 -> b
-    3:3:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):102 -> b
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create():32:32 -> c
-    1:1:void clear():84:84 -> clear
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createConcurrent():46:46 -> d
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():50:50 -> e
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():54:54 -> f
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):36:36 -> g
-    2:4:java.util.Set toDefinitionSet():114:116 -> g
-    1:1:boolean isEmpty():88:88 -> isEmpty
-    1:1:java.util.Iterator iterator():93:93 -> iterator
-    1:1:int size():106:106 -> size
-    1:1:java.util.stream.Stream stream():110:110 -> stream
+    1:2:void <init>(java.util.Map):28:29 -> <init>
+    1:2:boolean add(com.android.tools.r8.graph.ProgramMethod):59:60 -> a
+    3:3:void addAll(java.lang.Iterable):65:65 -> a
+    4:4:void addAll(com.android.tools.r8.utils.collections.ProgramMethodSet):69:69 -> a
+    5:5:boolean createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):73:73 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
+    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):77 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
+    9:9:void lambda$toDefinitionSet$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):117:117 -> a
+    1:1:boolean contains(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> b
+    2:2:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):103 -> b
+    3:3:boolean remove(com.android.tools.r8.graph.DexMethod):98:98 -> b
+    3:3:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):103 -> b
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create():33:33 -> c
+    1:1:void clear():85:85 -> clear
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createConcurrent():47:47 -> d
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():51:51 -> e
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():55:55 -> f
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):37:37 -> g
+    2:4:java.util.Set toDefinitionSet():115:117 -> g
+    1:1:boolean isEmpty():89:89 -> isEmpty
+    1:1:java.util.Iterator iterator():94:94 -> iterator
+    1:1:int size():107:107 -> size
+    1:1:java.util.stream.Stream stream():111:111 -> stream
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.utils.w1.f:
+    1:1:void <init>(java.util.TreeMap):20:20 -> <init>
+    1:3:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):34:36 -> a
+    4:5:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getReference():254:254 -> a
+    4:5:int lambda$toDefinitionSet$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):43 -> a
+    6:6:int lambda$toDefinitionSet$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):43:43 -> a
+    1:1:void lambda$toDefinitionSet$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):45:45 -> b
+    1:4:java.util.Set toDefinitionSet():42:45 -> g
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():24:24 -> h